summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-11-19 23:10:33 +0100
committerBjorn Helgaas <bhelgaas@google.com>2014-11-19 23:10:33 +0100
commit18e88beceb1838cfa7cc1a9abf16f5b419e11fdd (patch)
tree3011b8e28d7a78265b260255f5839e54c119b7e3 /drivers/pci
parentMerge branches 'pci/host-designware', 'pci/host-dra7xx', 'pci/host-exynos', '... (diff)
parentPCI: Remove fixed parameter in pci_iov_resource_bar() (diff)
parentPCI: Remove unused and broken to_hotplug_slot() (diff)
parentPCI: Make FLR and AF FLR reset warning messages different (diff)
parentPCI: Allow numa_node override via sysfs (diff)
parentxen/pcifront: Process failure for pcifront_(re)scan_root() (diff)
downloadlinux-18e88beceb1838cfa7cc1a9abf16f5b419e11fdd.tar.xz
linux-18e88beceb1838cfa7cc1a9abf16f5b419e11fdd.zip
Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/numa' and 'pci/virtualization' into next
* pci/enumeration: PCI: Remove fixed parameter in pci_iov_resource_bar() PCI: Add informational printk for invalid BARs PCI: Shrink decoding-disabled window while sizing BARs PCI: Restore detection of read-only BARs * pci/hotplug: PCI: Remove unused and broken to_hotplug_slot() * pci/misc: PCI: Make FLR and AF FLR reset warning messages different PCI: Simplify if-return sequences PCI: Delete unnecessary NULL pointer checks * pci/numa: PCI: Allow numa_node override via sysfs * pci/virtualization: xen/pcifront: Process failure for pcifront_(re)scan_root()