summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-05-03 18:49:21 +0200
committerBjorn Helgaas <bhelgaas@google.com>2016-05-03 18:49:21 +0200
commitd9322d226f91ad95825ab68f3e5cfeda7b9c4553 (patch)
treeb064cdad836596d765d716b34244e73c2f08d7f1 /drivers/pci
parentMerge branches 'pci/host-armada', 'pci/host-designware', 'pci/host-hv', 'pci/... (diff)
parentPCI: Add Downstream Port Containment driver (diff)
parentalpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO (diff)
parentthunderbolt: Fix double free of drom buffer (diff)
downloadlinux-d9322d226f91ad95825ab68f3e5cfeda7b9c4553.tar.xz
linux-d9322d226f91ad95825ab68f3e5cfeda7b9c4553.zip
Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next
* pci/dpc: PCI: Add Downstream Port Containment driver PCI: Add Downstream Port Containment portdrv service type PCI: Widen portdrv service type from 4 bits to 8 bits * pci/resource: alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO PCI: Supply CPU physical address (not bus address) to iomem_is_exclusive() * pci/thunderbolt: thunderbolt: Fix double free of drom buffer