summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-11-19 15:10:33 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-11-19 15:10:33 -0700
commit18e88beceb1838cfa7cc1a9abf16f5b419e11fdd (patch)
tree3011b8e28d7a78265b260255f5839e54c119b7e3
parent35437e3d9b4171ffaf6867f5d8685159173df6ee (diff)
parent26ff46c6f23bb1497aaa1364a5c73a109493b653 (diff)
parenta4acded086c4320bc58bd59ea746fd19de6dabb0 (diff)
parentbb383e283b2c2dca8eb5152a1a2477efcc469431 (diff)
parent63692df103e9c76b26c382ce8079283b7df9a99a (diff)
parent23cf1d006f1a32cebf7ac6910ac6bcf41adfd702 (diff)
downloadlinux-18e88beceb1838cfa7cc1a9abf16f5b419e11fdd.tar.bz2
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()