diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-17 00:51:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-17 00:51:57 +0200 |
commit | 3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b (patch) | |
tree | 194b96f2d90235f8511a125dfe29d8d3d9eed55c /include/uapi/video | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
parent | tools/virtio: add dma stubs (diff) | |
download | linux-3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b.tar.xz linux-3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/uapi/video')
0 files changed, 0 insertions, 0 deletions