Merge tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/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

diff --combined drivers/edac/Kconfig
index df9467eef32a0e4b67090e56e1a5c0260a0f4037,68e479b4d9c97660f29961e2d09c07b1e71fabdf..41c9ccdd20d65658f461991ab4e8bc74d0e6fa4a
--- 1/drivers/edac/Kconfig
--- 2/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@@ -234,6 -234,7 +234,7 @@@ config EDAC_SK
        depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG
        depends on ACPI_NFIT || !ACPI_NFIT # if ACPI_NFIT=m, EDAC_SKX can't be y
        select DMI
+       select ACPI_ADXL if ACPI
        help
          Support for error detection and correction the Intel
          Skylake server Integrated Memory Controllers. If your
@@@ -460,18 -461,4 +461,18 @@@ config EDAC_T
          Support for error detection and correction on the
            TI SoCs.
  
 +config EDAC_QCOM
 +      tristate "QCOM EDAC Controller"
 +      depends on ARCH_QCOM && QCOM_LLCC
 +      help
 +        Support for error detection and correction on the
 +        Qualcomm Technologies, Inc. SoCs.
 +
 +        This driver reports Single Bit Errors (SBEs) and Double Bit Errors (DBEs).
 +        As of now, it supports error reporting for Last Level Cache Controller (LLCC)
 +        of Tag RAM and Data RAM.
 +
 +        For debugging issues having to do with stability and overall system
 +        health, you should probably say 'Y' here.
 +
  endif # EDAC