From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 28 May 2014 22:21:07 +0000 (-0600)
Subject: Merge branches 'pci/hotplug', 'pci/pci_is_bridge' and 'pci/virtualization' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1a2523d2adc0b6910dbc2a9aed44c4217134db1;p=linux.git

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
---

d1a2523d2adc0b6910dbc2a9aed44c4217134db1
diff --cc drivers/pci/pci-sysfs.c
index b7333fa5f80d3,4e0acefb7565d,4e0acefb7565d,faa4ab554d68a..84c350994b060
--- a/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,
    };