diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 14:35:38 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-17 14:35:38 -0500 |
commit | 45604e68ed7acf23e6c4cbac9930c61df19220c8 (patch) | |
tree | f5993c93fd2aefea491c3680a5222a1fc6f7408d /drivers/pci | |
parent | d9322d226f91ad95825ab68f3e5cfeda7b9c4553 (diff) | |
parent | f8415222837b651902661f12f5760169690f6696 (diff) | |
parent | ad67b437f187ea818b2860524d10f878fadfdd99 (diff) | |
download | linux-45604e68ed7acf23e6c4cbac9930c61df19220c8.tar.gz linux-45604e68ed7acf23e6c4cbac9930c61df19220c8.tar.bz2 linux-45604e68ed7acf23e6c4cbac9930c61df19220c8.zip |
Merge branches 'pci/hotplug' and 'pci/resource' into next
* pci/hotplug:
PCI: Use cached copy of PCI_EXP_SLTCAP_HPC bit
* pci/resource:
PCI: Disable all BAR sizing for devices with non-compliant BARs
x86/PCI: Mark Broadwell-EP Home Agent 1 as having non-compliant BARs
PCI: Identify Enhanced Allocation (EA) BAR Equivalent resources in sysfs