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

* pci/enumeration:
  PCI: Cleanup control flow
  sparc/PCI: Claim bus resources before pci_bus_add_devices()
  PCI: Assign resources before drivers claim devices (pci_scan_root_bus())
  PCI: Assign resources before drivers claim devices (pci_scan_bus())

* pci/virtualization:
  PCI: Add ACS quirks for Intel 1G NICs

diff --cc arch/s390/pci/pci.c
Simple merge

diff --cc drivers/pci/host/pci-versatile.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge