aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-24 09:46:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-24 09:46:29 -0700
commit2d7ed01e5bda639bdbca5507e06c34f46348b681 (patch)
treeef207eec5dd2d8ff4046948b51b16ba9a256672e /include
parent2368a9426fe8320e3d23b0584d861ebeb2aa80f2 (diff)
parent7cbeb9f90db8e56856db7568520b735732d34d86 (diff)
Merge tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: "Here are a few fixes that should be in v3.17. - Reverting "Don't scan random busses" covers up a CardBus regression having to do with allocating CardBus bus numbers. - Reverting "Make sure bus numbers stay within parents bounds" covers up an ACPI _CRS bug that makes us reconfigure a bridge, causing a broken device behind it to stop responding. - The pciehp timeout change fixes some code we added in v3.17. Without the fix, we can send a new hotplug command too early, before the timeout has expired. I hope for better fixes for the reverts, but those will have to come after v3.17" * tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: pciehp: Fix pcie_wait_cmd() timeout Revert "PCI: Make sure bus number resources stay within their parents bounds" Revert "PCI: Don't scan random busses in pci_scan_bridge()"
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions