From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2016 22:30:04 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.7-rc1~132
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d974f09ea4970d0299a8267111312b80adbd20e6

Merge branch 'stable/for-linus-4.7' of git://git./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
---

d974f09ea4970d0299a8267111312b80adbd20e6