Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 19:37:45 +0000 (12:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2018 19:37:45 +0000 (12:37 -0700)
commit2a7e1211e130c51a2b5743ecf247645ac8e936ee
tree13de0b4ef924f459c6f2665166127cc9dd649d60
parent79facf308f4dd13b162430746117a11b3116a4da
parent498e8bf51c633cc4496343e6113f340f8e9301ae
Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "Fix deadlock in mbochs sample driver (Alexey Khoroshilov)"

* tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio:
  sample: vfio-mdev: avoid deadlock in mdev_access()