diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 15:30:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 15:30:04 -0700 |
| commit | d974f09ea4970d0299a8267111312b80adbd20e6 (patch) | |
| tree | 2b8874872d0fb1fd5e1f5addc343ec29cc98b3cd /include/trace | |
| parent | 4a5219edcdae52bfb5eea0dfc2a7bd575961dad7 (diff) | |
| parent | b3c8eb50383178f3a4dcf1dc867001156da6473d (diff) | |
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
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions