From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jan 2018 02:01:55 +0000 (+0100)
Subject: Merge branches 'acpi-x86', 'acpi-apei' and 'acpi-ec'
X-Git-Tag: v4.16-rc1~195^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0c81e26e8641cd34af2f467e870dc96e85681f1e;p=linux.git

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

0c81e26e8641cd34af2f467e870dc96e85681f1e