From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jul 2018 19:23:53 +0000 (-0700)
Subject: Merge tag 'vfio-v4.18-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1bb155702d0f533035aa2bd829b8e32848dbca3d;p=linux.git

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
---

1bb155702d0f533035aa2bd829b8e32848dbca3d