Merge branches 'pci/hotplug', 'pci/pci_is_bridge' and 'pci/virtualization' into next

* pci/hotplug:
  PCI: cpqphp: Fix possible null pointer dereference
  NVMe: Implement PCIe reset notification callback
  PCI: Notify driver before and after device reset

* pci/pci_is_bridge:
  pcmcia: Use pci_is_bridge() to simplify code
  PCI: pciehp: Use pci_is_bridge() to simplify code
  PCI: acpiphp: Use pci_is_bridge() to simplify code
  PCI: cpcihp: Use pci_is_bridge() to simplify code
  PCI: shpchp: Use pci_is_bridge() to simplify code
  PCI: rpaphp: Use pci_is_bridge() to simplify code
  sparc/PCI: Use pci_is_bridge() to simplify code
  powerpc/PCI: Use pci_is_bridge() to simplify code
  ia64/PCI: Use pci_is_bridge() to simplify code
  x86/PCI: Use pci_is_bridge() to simplify code
  PCI: Use pci_is_bridge() to simplify code
  PCI: Add new pci_is_bridge() interface
  PCI: Rename pci_is_bridge() to pci_has_subordinate()

* pci/virtualization:
  PCI: Introduce new device binding path using pci_dev.driver_override

Conflicts:
	drivers/pci/pci-sysfs.c

diff --cc Documentation/ABI/testing/sysfs-bus-pci
Simple merge

diff --cc arch/x86/pci/fixup.c
Simple merge

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

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

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

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

diff --cc drivers/pci/pci-sysfs.c
index b7333fa5f80d3d88ec419319a7431f44cf0aed0a,4e0acefb7565d0f3b81013855efa85c86ca5a98e,4e0acefb7565d0f3b81013855efa85c86ca5a98e,faa4ab554d68acac61f8e34036a34cdd4e5613bf..84c350994b06097d36e3fffa0b5465f11376d4db
--- 1/drivers/pci/pci-sysfs.c
--- 2/drivers/pci/pci-sysfs.c
--- 3/drivers/pci/pci-sysfs.c
--- 4/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@@@@ -535,10 -520,7 -520,7 -559,8 +574,11 @@@@@ static struct attribute *pci_dev_attrs[
        &dev_attr_msi_bus.attr,
    #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
        &dev_attr_d3cold_allowed.attr,
   +#endif
 +++#ifdef CONFIG_OF
 +++    &dev_attr_devspec.attr,
 ++ #endif
+++     &dev_attr_driver_override.attr,
        NULL,
    };
    

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

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

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

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

diff --cc include/linux/pci.h
Simple merge