Merge branch 'pci/hotplug'

- Ignore Presence Detect Changed caused by DPC.  pciehp already ignores
  Link Down/Up events caused by DPC, but on slots using in-band presence
  detect, DPC causes a spurious Presence Detect Changed event (Lukas
  Wunner)

- Ignore Link Down/Up caused by Secondary Bus Reset.  On hotplug ports
  using in-band presence detect, the reset causes a Presence Detect Changed
  event, which mistakenly caused teardown and re-enumeration of the device.
  Drivers may need to annotate code that resets their device (Lukas Wunner)

* pci/hotplug:
  PCI: hotplug: Drop superfluous #include directives
  PCI: pciehp: Ignore Link Down/Up caused by Secondary Bus Reset
  PCI: pciehp: Ignore Presence Detect Changed caused by DPC

# Conflicts:
#	drivers/pci/pci.h

diff --cc drivers/pci/pci.h
index aed7affd4b8cdb11dbfdaa462335e583d5afff56,7db798bdcaaae6f1b14eb09a35358ad0e3c3e3aa..fd2fe406e65adc3bb07c1361ce0c143a0e5bc6f8
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -557,8 -558,8 +558,10 @@@ static inline int pci_dev_set_disconnec
  #define PCI_DPC_RECOVERED 1
  #define PCI_DPC_RECOVERING 2
  #define PCI_DEV_REMOVED 3
+ #define PCI_LINK_CHANGED 4
+ #define PCI_LINK_CHANGING 5
 +#define PCI_LINK_LBMS_SEEN    6
 +#define PCI_DEV_ALLOW_BINDING 7
  
  static inline void pci_dev_assign_added(struct pci_dev *dev)
  {

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