From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 May 2016 19:04:40 +0000 (-0700)
Subject: Merge tag 'pci-v4.6-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
X-Git-Tag: v5.15~13700
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c5114626f33b62fa7595e57d87f33d9d1f8298a2;p=mirror_ubuntu-kernels.git

Merge tag 'pci-v4.6-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
 "Since v4.5, we've WARNed during resume if a PCI device, including a
  Thunderbolt device, was added while we were suspended.  A change we
  merged for v4.6-rc1 turned that warning into a system hang.  These
  enumeration patches from Lukas Wunner fix this issue:

   - Fix BUG on device attach failure
   - Do not treat EPROBE_DEFER as device attach failure"

* tag 'pci-v4.6-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Do not treat EPROBE_DEFER as device attach failure
  PCI: Fix BUG on device attach failure
---

c5114626f33b62fa7595e57d87f33d9d1f8298a2