Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Warn on driver probe return value greater than zero
  PCI: Drop warning about drivers that don't use pci_set_master()
  PCI: Workaround missing pci_set_master in pci drivers
  PCI: Update pcie_ports 'auto' behavior for non-ACPI platforms

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

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