diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-06 12:23:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-06 12:23:53 -0700 |
| commit | 1bb155702d0f533035aa2bd829b8e32848dbca3d (patch) | |
| tree | 143344a22e4618690786b698b23386a9fa04aaef /drivers/ntb/ntb.c | |
| parent | b4d0562137c9035becad5fc0588f6163aed916db (diff) | |
| parent | d7ef4899d7182f9d4267b4e4a5cc3689c1a04f25 (diff) | |
Merge tag 'vfio-v4.18-rc4' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- Make vfio-pci IGD extensions optional via Kconfig (Alex Williamson)
- Remove unused and soon to be removed map_atomic callback from mbochs
sample driver, add unmap callback to avoid dmabuf leaks (Gerd
Hoffmann)
- Fix usage of get_user_pages_longterm() (Jason Gunthorpe)
- Fix sample mbochs driver vm_operations_struct.fault return type
(Souptick Joarder)
* tag 'vfio-v4.18-rc4' of git://github.com/awilliam/linux-vfio:
sample/vfio-mdev: Change return type to vm_fault_t
vfio: Use get_user_pages_longterm correctly
sample/mdev/mbochs: add mbochs_kunmap_dmabuf
sample/mdev/mbochs: remove mbochs_kmap_atomic_dmabuf
vfio/pci: Make IGD support a configurable option
Diffstat (limited to 'drivers/ntb/ntb.c')
0 files changed, 0 insertions, 0 deletions