From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Sep 2014 16:46:29 +0000 (-0700)
Subject: Merge tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v3.17-rc7~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d7ed01e5bda639bdbca5507e06c34f46348b681;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge tag 'pci-v3.17-fixes-3' of git://git./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()"
---

2d7ed01e5bda639bdbca5507e06c34f46348b681