From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jul 2018 19:37:45 +0000 (-0700)
Subject: Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a7e1211e130c51a2b5743ecf247645ac8e936ee;p=openwrt%2Fstaging%2Fblogic.git

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

2a7e1211e130c51a2b5743ecf247645ac8e936ee