Skip to content
  • Linus Torvalds's avatar
    Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · c0c770e6
    Linus Torvalds authored
    * 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI, APEI, EINJ Param support is disabled by default
      APEI GHES: 32-bit buildfix
      ACPI: APEI build fix
      ACPI, APEI, GHES: Add hardware memory error recovery support
      HWPoison: add memory_failure_queue()
      ACPI, APEI, GHES, Error records content based throttle
      ACPI, APEI, GHES, printk support for recoverable error via NMI
      lib, Make gen_pool memory allocator lockless
      lib, Add lock-less NULL terminated single list
      Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG
      ACPI, APEI, Add WHEA _OSC support
      ACPI, APEI, Add APEI bit support in generic _OSC call
      ACPI, APEI, GHES, Support disable GHES at boot time
      ACPI, APEI, GHES, Prevent GHES to be built as module
      ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST
      ACPI, APEI, Add apei_exec_run_optional
      ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic
      ACPI, APEI, ERST, Fix erst-dbg long record reading issue
      ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled
    c0c770e6