diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 03:01:55 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 03:01:55 +0100 |
commit | 0c81e26e8641cd34af2f467e870dc96e85681f1e (patch) | |
tree | 33f5f4a526fda72b1dbda4b4af414467b06d8c98 /arch/x86/include | |
parent | Merge branches 'acpi-numa', 'acpi-sysfs', 'acpi-pmic', 'acpi-soc' and 'acpi-ged' (diff) | |
parent | ACPI / x86: boot: Propagate error code in acpi_gsi_to_irq() (diff) | |
parent | Merge back APEI material for v4.16. (diff) | |
parent | ACPI: EC: Fix debugfs_create_*() usage (diff) | |
download | linux-0c81e26e8641cd34af2f467e870dc96e85681f1e.tar.xz linux-0c81e26e8641cd34af2f467e870dc96e85681f1e.zip |
Merge branches 'acpi-x86', 'acpi-apei' and 'acpi-ec'
* acpi-x86:
ACPI / x86: boot: Propagate error code in acpi_gsi_to_irq()
ACPI / x86: boot: Don't setup SCI on HW-reduced platforms
ACPI / x86: boot: Use INVALID_ACPI_IRQ instead of 0 for acpi_sci_override_gsi
ACPI / x86: boot: Get rid of ACPI_INVALID_GSI
ACPI / x86: boot: Swap variables in condition in acpi_register_gsi_ioapic()
* acpi-apei:
ACPI / APEI: remove redundant variables len and node_len
ACPI: APEI: call into AER handling regardless of severity
ACPI: APEI: handle PCIe AER errors in separate function
* acpi-ec:
ACPI: EC: Fix debugfs_create_*() usage