From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Nov 2018 18:17:22 +0000 (-0700)
Subject: Merge tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b21f21ae0d746b385a827aceb84cb26c551eb94;p=linux.git

Merge tag 'edac_for_4.20_2' of git://git./linux/kernel/git/bp/bp

Pull more EDAC updates from Borislav Petkov:
 "The second part of the EDAC pile which contains the ADXL user and a
  build fix which addresses a not-so-sensical .config but fixes
  randconfig builds people do:

   - skx_edac: Address translation for NVDIMMs (Tony Luck and Qiuxu Zhuo)

   - ACPI_ADXL build fix"

[ I don't think "sensical" is a word, particularly when used in the
  context of actually meaning "nonsensical", but I like it   - Linus ]

* tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, skx: Fix randconfig builds
  EDAC, skx_edac: Add address translation for non-volatile DIMMs
---

0b21f21ae0d746b385a827aceb84cb26c551eb94