Merge branch 'pci/enumeration'

- Remove pci_fixup_cardbus(), which has no users left (Heiner Kallweit)

- Print the actual delay time in pci_bridge_wait_for_secondary_bus()
  instead of assuming it was 1000ms (Wilfred Mallawa)

- Revert 'iommu/amd: Prevent binding other PCI drivers to IOMMU PCI
  devices', which broke resume from system sleep on AMD platforms and has
  been fixed by other commits (Lukas Wunner)

- Restrict visibility of pci_dev.match_driver since it's no longer used
  outside the PCI core (Lukas Wunner)

* pci/enumeration:
  PCI: Limit visibility of match_driver flag to PCI core
  Revert "iommu/amd: Prevent binding other PCI drivers to IOMMU PCI devices"
  PCI: Print the actual delay time in pci_bridge_wait_for_secondary_bus()
  PCI: Use PCI_STD_NUM_BARS instead of 6
  PCI: Remove pci_fixup_cardbus()

# Conflicts:
#	drivers/pci/pci.h

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

diff --cc drivers/pci/pci.h
index 29a8fdffe52a3195d11b26b1dcab3c936bdf96ec,de5d4ef943b2917c9d7dd8c8d2582459c0b15407..aed7affd4b8cdb11dbfdaa462335e583d5afff56
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -557,7 -557,7 +557,8 @@@ 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_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