Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jan 2021 21:30:28 +0000 (13:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jan 2021 21:30:28 +0000 (13:30 -0800)
commit9f1abbe97c08ba7ed609791627533a805a1b2c66
treeddec9ac8cffa80eb7f58216c979a8d963f909fd9
parent1d011777cdbe7ae38a854a0cbeb6bdfbf724cce0
parente13a6915a03ffc3ce332d28c141a335e25187fa3
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull vhost bugfix from Michael Tsirkin:
 "This fixes configs with vhost vsock behind a viommu"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/vsock: add IOTLB API support