tree 2b8874872d0fb1fd5e1f5addc343ec29cc98b3cd
parent 4a5219edcdae52bfb5eea0dfc2a7bd575961dad7
parent b3c8eb50383178f3a4dcf1dc867001156da6473d
author Linus Torvalds <torvalds@linux-foundation.org> 1463610604 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1463610604 -0700

Merge branch 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft

Pull iscsi_ibft updates from Konrad Rzeszutek Wilk:
 "The pull has two features - both of them expand the SysFS entries:

   - 'prefix-len' - which is subnet_mask_prefix of the iBFT header.

   - 'acpi_header' dir with: 'iBFT', OEM-ID (whatever it extracts from
     the iBFT header) and OEM_TABLE_ID (also whatever it extracts from
     the iBFT header).  This is to help NIC drivers to figure out during
     bootup how to deal with BIOS created iBFT tables (like by TianoCore
     UEFI implemenation)"

* 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  ibft: Expose iBFT acpi header via sysfs
  iscsi_ibft: Add prefix-len attr and display netmask