diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-04 20:30:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-04 20:30:45 +0100 |
| commit | fb39cbda147082a2e7dc4e2b5f3298448295e3c4 (patch) | |
| tree | 7dcbed6849a900f66f1d2a0b31d82721c6b4ed1e /net/mac80211/iface.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | nfit: Adjust for different _FIT and NFIT headers (diff) | |
| download | linux-fb39cbda147082a2e7dc4e2b5f3298448295e3c4.tar.xz linux-fb39cbda147082a2e7dc4e2b5f3298448295e3c4.zip | |
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
- NFIT parsing regression fixes from Linda. The nvdimm hot-add
implementation merged in 4.4-rc1 interpreted the specification in a
way that breaks actual HPE platforms. We are also closing the loop
with the ACPI Working Group to get this clarification added to the
spec.
- Andy pointed out that his laptop without nvdimm resources is loading
the e820-nvdimm module by default, fix that up to only load the
module when an e820-type-12 range is present.
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
nfit: Adjust for different _FIT and NFIT headers
nfit: Fix the check for a successful NFIT merge
nfit: Account for table size length variation
libnvdimm, e820: skip module loading when no type-12
Diffstat (limited to 'net/mac80211/iface.c')
0 files changed, 0 insertions, 0 deletions