Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable access to non-standard VPD for Chelsio devices (cxgb3)
  PCI: Expand "VPD access disabled" quirk message
  PCI: pciehp: Remove loading message
  PCI: hotplug: Remove hotplug core message
  PCI: Remove service driver load/unload messages
  PCI/AER: Log AER IRQ when claiming Root Port
  PCI/AER: Log errors with PCI device, not PCIe service device
  PCI/AER: Remove unused version macros
  PCI/PME: Log PME IRQ when claiming Root Port
  PCI/PME: Drop unused support for PMEs from Root Complex Event Collectors
  PCI: Move config space size macros to pci_regs.h

diff --combined drivers/pci/pci.h
index 72b128e,9cbcf1d..8834cb1
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -1,9 -1,6 +1,6 @@@
  #ifndef DRIVERS_PCI_H
  #define DRIVERS_PCI_H
  
- #define PCI_CFG_SPACE_SIZE    256
- #define PCI_CFG_SPACE_EXP_SIZE        4096
- 
  #define PCI_FIND_CAP_TTL      48
  
  extern const unsigned char pcie_link_speed[];
@@@ -356,9 -353,4 +353,9 @@@ static inline int pci_dev_specific_rese
  }
  #endif
  
 +#if defined(CONFIG_PCI_QUIRKS) && defined(CONFIG_ARM64)
 +int acpi_get_rc_resources(struct device *dev, const char *hid, u16 segment,
 +                        struct resource *res);
 +#endif
 +
  #endif /* DRIVERS_PCI_H */