Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d1cf89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC updates from Borislav Petkov:

 - an EDAC driver for Cavium ThunderX RAS IP (Sergey Temerkhanov)

 - removal of DRAM error reporting through PCI SERR NMI (Borislav
   Petkov)

 - misc small fixes (Jan Glauber, Thor Thayer)

* tag 'edac_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, ghes: Do not enable it by default
  EDAC: Rename report status accessors
  EDAC: Delete edac_stub.c
  EDAC: Update Kconfig help text
  EDAC: Remove EDAC_MM_EDAC
  EDAC: Issue tracepoint only when it is defined
  ACPI/extlog: Add EDAC dependency
  EDAC: Move edac_op_state to edac_mc.c
  EDAC: Remove edac_err_assert
  EDAC: Get rid of edac_handlers
  x86/nmi, EDAC: Get rid of DRAM error reporting thru PCI SERR NMI
  EDAC, highbank: Align Makefile directives
  EDAC, thunderx: Remove unused code
  EDAC, thunderx: Change LMC index calculation
  EDAC, altera: Fix peripheral warnings for Cyclone5
  EDAC, thunderx: Fix L2C MCI interrupt disable
  EDAC, thunderx: Add Cavium ThunderX EDAC driver
parents 08c521a2 f8d5549d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4715,6 +4715,7 @@ L: linux-edac@vger.kernel.org 
L:	linux-mips@linux-mips.org

S:	Supported

F:	drivers/edac/octeon_edac*

F:	drivers/edac/thunderx_edac*



EDAC-E752X

M:	Mark Gross <mark.gross@intel.com>

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -748,7 +748,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 
CONFIG_LEDS_TRIGGER_TRANSIENT=y

CONFIG_LEDS_TRIGGER_CAMERA=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y

CONFIG_EDAC_HIGHBANK_L2=y

CONFIG_RTC_CLASS=y

arch/arm/configs/pxa_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -635,8 +635,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m 
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m

CONFIG_LEDS_TRIGGER_TRANSIENT=m

CONFIG_LEDS_TRIGGER_CAMERA=m

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=m

CONFIG_EDAC=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DEBUG=y

CONFIG_RTC_DRV_DS1307=m

arch/powerpc/configs/85xx-hw.config

+1 −2
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ CONFIG_DAVICOM_PHY=y 
CONFIG_DMADEVICES=y

CONFIG_E1000E=y

CONFIG_E1000=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_LEGACY=y

CONFIG_FB_FSL_DIU=y

arch/powerpc/configs/85xx/ge_imp3a_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 
CONFIG_USB_OHCI_HCD_PPC_OF_LE=y

CONFIG_USB_STORAGE=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_MPC85XX=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_INTF_PROC is not set