From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Aug 2015 20:53:08 +0000 (-0500)
Subject: Merge branches 'pci/enumeration' and 'pci/misc' into next
X-Git-Tag: v4.9.8~3693^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ca678d1dff610f7df6ac9b31fd9152c4426f815;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branches 'pci/enumeration' and 'pci/misc' into next

* pci/enumeration:
  PCI: Set MPS to match upstream bridge
  PCI: Move MPS configuration check to pci_configure_device()
  PCI: Drop references acquired by of_parse_phandle()
  PCI/MSI: Remove unused pcibios_msi_controller() hook
  ARM/PCI: Remove msi_controller from struct pci_sys_data
  ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi()
  PCI: Add pci_scan_root_bus_msi()
  ARM/PCI: Replace panic with WARN messages on failures
  PCI: generic: Add arm64 support
  PCI: Build setup-irq.o for arm64
  PCI: generic: Remove dependency on ARM-specific struct hw_pci
  ARM/PCI: Set MPS before pci_bus_add_devices()

* pci/misc:
  PCI: Disable async suspend/resume for JMicron multi-function SATA/AHCI
---

9ca678d1dff610f7df6ac9b31fd9152c4426f815