diff options
| author | Linus Torvalds | 2016-05-10 21:04:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-10 21:04:40 +0200 |
| commit | c5114626f33b62fa7595e57d87f33d9d1f8298a2 (patch) | |
| tree | 9e6e746cc7ec599e44ffa33578af40236019b65f /include/linux/lockdep.h | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | PCI: Do not treat EPROBE_DEFER as device attach failure (diff) | |
| download | kernel-qcow2-linux-c5114626f33b62fa7595e57d87f33d9d1f8298a2.tar.gz kernel-qcow2-linux-c5114626f33b62fa7595e57d87f33d9d1f8298a2.tar.xz kernel-qcow2-linux-c5114626f33b62fa7595e57d87f33d9d1f8298a2.zip | |
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
Diffstat (limited to 'include/linux/lockdep.h')
0 files changed, 0 insertions, 0 deletions