diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-04 00:25:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-04 00:25:14 +0200 |
commit | 869c058fbe741cadff09647c68dbeae7d012f52d (patch) | |
tree | b54246c6abcca7ed0f8de92d92ff3bafaeb539ac /include/pcmcia | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
parent | vfio/pci: Fix handling of RC integrated endpoint PCIe capability size (diff) | |
download | linux-869c058fbe741cadff09647c68dbeae7d012f52d.tar.xz linux-869c058fbe741cadff09647c68dbeae7d012f52d.zip |
Merge tag 'vfio-v4.13-rc4' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- SPAPR/EEH config build fix (Murilo Opsfelder Araujo)
- Fix possible device lock deadlock (Alex Williamson)
- Correctly size integrated endpoint PCIe capabilities (Alex
Williamson)
* tag 'vfio-v4.13-rc4' of git://github.com/awilliam/linux-vfio:
vfio/pci: Fix handling of RC integrated endpoint PCIe capability size
vfio/pci: Use pci_try_reset_function() on initial open
include/linux/vfio.h: Guard powerpc-specific functions with CONFIG_VFIO_SPAPR_EEH
Diffstat (limited to 'include/pcmcia')
0 files changed, 0 insertions, 0 deletions