From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Apr 2021 23:28:18 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=18a3c5f7abfdf97f88536d35338ebbee119c355c;p=linux.git

Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Very late in the cycle but both risky if left unfixed and more or less
  obvious.."

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails
  vhost-vdpa: protect concurrent access to vhost device iotlb
---

18a3c5f7abfdf97f88536d35338ebbee119c355c