diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 05:01:55 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 05:01:55 +0300 |
| commit | 0c81e26e8641cd34af2f467e870dc96e85681f1e (patch) | |
| tree | 33f5f4a526fda72b1dbda4b4af414467b06d8c98 | |
| parent | 13c35c83886e3b40a8e7f1ec17318854b75ea988 (diff) | |
| parent | a89bca278220a4ea57ea5e57a037262f258c7d72 (diff) | |
| parent | fd0861952da809f9879939d20630838e28caecd4 (diff) | |
| parent | 3522f867c13b63cf62acdf1b8ca5664c549a716a (diff) | |
| download | linux-0c81e26e8641cd34af2f467e870dc96e85681f1e.tar.xz | |
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