diff options
| author | Linus Torvalds | 2017-08-03 15:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-08-03 15:25:14 -0700 |
| commit | 869c058fbe741cadff09647c68dbeae7d012f52d (patch) | |
| tree | b54246c6abcca7ed0f8de92d92ff3bafaeb539ac /fs/proc/kmsg.c | |
| parent | 995d03ae266d3f3bec8844d01b6c3ded19b9cc1c (diff) | |
| parent | 796b755066dd6254bfb6388fec901631e868d1c7 (diff) | |
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 'fs/proc/kmsg.c')
0 files changed, 0 insertions, 0 deletions