Merge tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Sep 2017 03:25:06 +0000 (20:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Sep 2017 03:25:06 +0000 (20:25 -0700)
commit8d93c7a4315711ea0f7a95ca353a89c4ed0763fb
tree256e06d8a485d48f780e311a62e7fdb49f154b91
parent02cfe977e813501ad0e524477eb5cd5b52860448
parent0f50a49e3008597abed0fff052d487f77db89093
Merge tag 'pci-v4.14-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Revert an attempt to fix a race while enabling upstream bridges
  because it broke iwlwifi firmware loading"

* tag 'pci-v4.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "PCI: Avoid race while enabling upstream bridges"