Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/ntb', 'pci/thunderb...

* pci/enumeration:
  x86/PCI: Refine PCI support check in pcibios_init()

* pci/hotplug:
  PCI: acpiphp_ibm: Avoid uninitialized variable reference

* pci/misc:
  PCI: Fix spelling errors

* pci/ntb:
  PCI: Add DMA alias quirk for mic_x200_dma
  PCI: Add support for multiple DMA aliases
  PCI: Move informational printk to pci_add_dma_alias()
  PCI: Add pci_add_dma_alias() to abstract implementation

* pci/thunderbolt:
  thunderbolt: Support 1st gen Light Ridge controller
  thunderbolt: Fix typos and magic number
  PCI: Add Intel Thunderbolt device IDs

* pci/virtualization:
  PCI: Work around Intel Sunrise Point PCH incorrect ACS capability
  PCI: Reverse standard ACS vs device-specific ACS enabling
  PCI: Mark Intel i40e NIC INTx masking as broken

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

diff --cc drivers/pci/quirks.c
index 8e678027b9008ee15e741967313332db2818c8d8,8e678027b9008ee15e741967313332db2818c8d8,8e678027b9008ee15e741967313332db2818c8d8,8e678027b9008ee15e741967313332db2818c8d8,8889ac433cf141ca4e032a107b5c86f661e2b3b0,b1ff270622dd84a4b6ce2456ddc93ed9ac306152,ac47d6bc9946dd581ee6b0d0f71ec5046dd2ff25..ee72ebe18f4b5a6510d043da9abcee50cbada987
--- 1/drivers/pci/quirks.c
--- 2/drivers/pci/quirks.c
--- 3/drivers/pci/quirks.c
--- 4/drivers/pci/quirks.c
--- 5/drivers/pci/quirks.c
--- 6/drivers/pci/quirks.c
--- 7/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@@@@@@ -3276,9 -3276,9 -3276,9 -3276,9 -3276,9 -3302,14 -3309,9 +3335,14 @@@@@@@@ out
        pci_dev_put(nhi);
        pci_dev_put(sibling);
       }
----- -DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, 0x1547,
+++++ +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
+++++ +                        PCI_DEVICE_ID_INTEL_LIGHT_RIDGE,
    + +                        quirk_apple_wait_for_thunderbolt);
----   DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, 0x156d,
+++++ +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
+++++ +                        PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C,
++++                           quirk_apple_wait_for_thunderbolt);
    - -DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, 0x156d,
+++++ +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
+++++ +                        PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE,
                               quirk_apple_wait_for_thunderbolt);
       #endif
       

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