]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 3 May 2016 16:49:21 +0000 (11:49 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 3 May 2016 16:49:21 +0000 (11:49 -0500)
* 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

1  2  3  4 
drivers/pci/pcie/portdrv.h
drivers/pci/pcie/portdrv_acpi.c
drivers/pci/pcie/portdrv_core.c

Simple merge
Simple merge
Simple merge