From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Aug 2016 22:51:57 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v5.15~13014
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull virtio/vhost fixes from Michael Tsirkin:
 - test fixes
 - a vsock fix

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  tools/virtio: add dma stubs
  vhost/test: fix after swiotlb changes
  vhost/vsock: drop space available check for TX vq
  ringtest: test build fix
---

3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b