Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

* '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

diff --combined include/linux/acpi.h
index 2312e850aab8070f653a5c64684ca1f56d0f0ee3,e19527de6a93c3a5a089cb2a02c7d0c4a4ec54b4..6001b4da39ddc9ebd52e0f7691268abbe8ebb69d
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -238,6 -238,7 +238,6 @@@ extern int acpi_paddr_to_node(u64 start
  extern int pnpacpi_disabled;
  
  #define PXM_INVAL     (-1)
 -#define NID_INVAL     (-1)
  
  int acpi_check_resource_conflict(const struct resource *res);
  
@@@ -279,6 -280,8 +279,8 @@@ acpi_status acpi_run_osc(acpi_handle ha
  #define OSC_SB_CPUHP_OST_SUPPORT      8
  #define OSC_SB_APEI_SUPPORT           16
  
+ extern bool osc_sb_apei_support_acked;
+ 
  /* PCI defined _OSC bits */
  /* _OSC DW1 Definition (OS Support Fields) */
  #define OSC_EXT_PCI_CONFIG_SUPPORT            1