• Linus Torvalds's avatar
    Merge tag 'edac_for_4.11_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · ad0376eb
    Linus Torvalds authored
    Pull EDAC updates from Borislav Petkov:
     "A new EDAC driver for the Pondicherry2 memory controller IP found in
      the Intel Apollo Lake platform and the Denverton microserver.
      Plus small fixlets.
      Normally I had this queued for 4.12 but Tony requested for the
      pnd2_edac driver to possibly land in 4.11 therefore I'm sending it to
      you now.
      It is a driver for new hardware which people don't have yet so it
      shouldn't cause any regressions.
      The couple of patches ontop of it show that Qiuxu actually did test it
      on the hardware he has access to :)"
    * tag 'edac_for_4.11_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      EDAC, pnd2_edac: Fix reported DIMM number
      EDAC, pnd2_edac: Fix !EDAC_DEBUG build
      EDAC: Select DEBUG_FS
      EDAC, pnd2_edac: Add new EDAC driver for Intel SoC platforms
      EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro
      EDAC, xgene: Fix wrongly spelled "procesing"