Merge branches 'acpi-ec', 'acpi-apei', 'acpi-soc' and 'acpi-misc'

* acpi-ec:
  ACPI: EC: trust DSDT GPE for certain HP laptop
  ACPI: EC: Make more Asus laptops use ECDT _GPE

* acpi-apei:
  ACPI: APEI: fix synchronous external aborts in user-mode
  ACPI: APEI: Don't warn if ACPI is disabled

* acpi-soc:
  ACPI: LPSS: Use kstrtol() instead of simple_strtol()

* acpi-misc:
  ACPI: NVS: fix doc warnings in nvs.c
  ACPI: NUMA: fix typo in a comment
  ACPI: OSL: Use DEFINE_RES_IO_NAMED() to simplify code
  ACPI: bus: Call kobject_put() in acpi_init() error path
  ACPI: bus: Remove unneeded assignment
  ACPI: configfs: Replace ACPI_INFO() with pr_debug()
  ACPI: ipmi: Remove address space handler in error path
  ACPI: event: Remove redundant initialization of local variable
  ACPI: sbshc: Fix fall-through warning for Clang

diff --cc drivers/acpi/bus.c
index 14ec87a,be7da23,be7da23,be7da23,c69470e..60fb6a8
--- 1/drivers/acpi/bus.c
--- 2/drivers/acpi/bus.c
--- 3/drivers/acpi/bus.c
--- 4/drivers/acpi/bus.c
--- 5/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@@@@@ -1315,14 -1325,13 -1325,13 -1325,13 -1325,12 +1315,13 @@@@@@ static int __init acpi_init(void
        }
     
        acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
----    if (!acpi_kobj) {
++++    if (!acpi_kobj)
                pr_debug("%s: kset create error\n", __func__);
----            acpi_kobj = NULL;
----    }
     
 ++++   init_prmt();
        result = acpi_bus_init();
        if (result) {
++++            kobject_put(acpi_kobj);
                disable_acpi();
                return result;
        }

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/event.c
Simple merge

diff --cc drivers/acpi/nvs.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/sbshc.c
Simple merge