Merge tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Apr 2018 21:21:13 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Apr 2018 21:21:13 +0000 (14:21 -0700)
commitdd972f924df6bdbc0ab185a38d5d2361dbc26311
tree181c24478ae55284f7baee88c3cf794794467aa2
parent3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91
parent6fd052665274b4e7570491ba272f2dbb09cbbcd5
Merge tag 'edac_for_4.17' of git://git./linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:
 "Noteworthy is the NVDIMM support:

   - NVDIMM support to EDAC (Tony Luck)

   - misc fixes"

* tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, sb_edac: Remove variable length array usage
  EDAC, skx_edac: Detect non-volatile DIMMs
  firmware, DMI: Add function to look up a handle and return DIMM size
  acpi, nfit: Add function to look up nvdimm device and provide SMBIOS handle
  EDAC: Add new memory type for non-volatile DIMMs
  EDAC: Drop duplicated array of strings for memory type names
  EDAC, layerscape: Allow building for LS1021A
drivers/acpi/nfit/core.c
drivers/edac/Kconfig
drivers/firmware/dmi_scan.c
include/linux/dmi.h