From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Dec 2018 09:04:23 +0000 (+0100)
Subject: Merge branch 'acpi-pci'
X-Git-Tag: v5.0-rc1~177^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3eb85368460d942005ba305829e279d0fe4767e0;p=linux.git

Merge branch 'acpi-pci'

* acpi-pci:
  ACPI: Make PCI slot detection driver depend on PCI
  ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set
  arm64: select ACPI PCI code only when both features are enabled
  PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
  ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
  ACPI: Allow CONFIG_PCI to be unset for reboot
  ACPI: Move PCI reset to a separate function
---

3eb85368460d942005ba305829e279d0fe4767e0