From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Mar 2014 01:29:34 +0000 (-0700)
Subject: Merge tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ac9dc67b730f3a1d10c5abbf91ed773d1e277646;p=deliverable%2Flinux.git

Merge tag 'pci-v3.14-fixes-2' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
 "These are two important regression fixes for bugs we've introduced so
  far in v3.14.

  One of the resource allocation changes from the merge window is broken
  for 32-bit kernels where we don't use _CRS for PCI host bridges
  (mostly pre-2008 machines), so there's a fix for that.

  The INTx enable change we put in after the merge window turned out to
  break pciehp because we re-enable INTx on the hotplug bridge, which
  apparently breaks MSI for future hotplug events"

* tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Don't check resource_size() in pci_bus_alloc_resource()
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
---

ac9dc67b730f3a1d10c5abbf91ed773d1e277646