Skip to content
  • Linus Torvalds's avatar
    Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · ad6c2c2e
    Linus Torvalds authored
    Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
     "For:
    
       - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
       - error injection support for i5100, when EDAC debug is enabled;
       - fix edac when it is loaded builtin (early init for the subsystem);
       - a "Firmware First" EDAC driver, allowing ghes to report errors via
         EDAC (ghes-edac).
    
      With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
      that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
      i7core_edac or sb_edac are running, the error reports are
      unpredictable, as both BIOS and OS race to access the registers.  With
      ghes-edac, the EDAC core will refuse to register any other concurrent
      memory error driver.
    
      This patchset moves the ghes struct definitions to a separate header
      file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
      register/unregister and to report errors via ghes-edac.  Those changes
      were acked by ghes driver maintainer (Huang)."
    
    * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
      i5100_edac: convert to use simple_open()
      ghes_edac: fix to use list_for_each_entry_safe() when delete list items
      ghes_edac: Fix RAS tracing
      ghes_edac: Make it compliant with UEFI spec 2.3.1
      ghes_edac: Improve driver's printk messages
      ghes_edac: Don't credit the same memory dimm twice
      ghes_edac: do a better job of filling EDAC DIMM info
      ghes_edac: add support for reporting errors via EDAC
      ghes_edac: Register at EDAC core the BIOS report
      ghes: add the needed hooks for EDAC error report
      ghes: move structures/enum to a header file
      edac: add support for error type "Info"
      edac: add support for raw error reports
      edac: reduce stack pressure by using a pre-allocated buffer
      edac: lock module owner to avoid error report conflicts
      edac: remove proc_name from mci structure
      edac: add a new memory layer type
      edac: initialize the core earlier
      edac: better report error conditions in debug mode
      i5100_edac: Remove two checkpatch warnings
      ...
    ad6c2c2e