From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Dec 2018 03:41:58 +0000 (-0800)
Subject: Merge tag 'vfio-v4.21-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1984f65c2fbc0d2b557d6e89ece9b39267e215c6;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'vfio-v4.21-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Replace global vfio-pci lock with per bus lock to allow concurrent
   open and release (Alex Williamson)

 - Declare mdev function as static (Paolo Cretaro)

 - Convert char to u8 in mdev/mtty sample driver (Nathan Chancellor)

* tag 'vfio-v4.21-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-mdev/samples: Use u8 instead of char for handle functions
  vfio/mdev: add static modifier to add_mdev_supported_type
  vfio/pci: Parallelize device open and release
---

1984f65c2fbc0d2b557d6e89ece9b39267e215c6