From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jan 2021 21:30:28 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v5.11-rc3~36
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=9f1abbe97c08ba7ed609791627533a805a1b2c66;p=sfrench%2Fcifs-2.6.git

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

9f1abbe97c08ba7ed609791627533a805a1b2c66