]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge