From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 25 Apr 2016 19:35:26 +0000 (-0500)
Subject: Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/ntb', 'pci/thunderb... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f768544c2421c399c0909ad9d5a9f916cd96de3;p=linux-beck.git

Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/ntb', 'pci/thunderbolt' and 'pci/virtualization' into next

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

7f768544c2421c399c0909ad9d5a9f916cd96de3
diff --cc drivers/pci/quirks.c
index 8e678027b900,8e678027b900,8e678027b900,8e678027b900,8889ac433cf1,b1ff270622dd,ac47d6bc9946..ee72ebe18f4b
--- a/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