summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-03 05:54:45 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-03 05:54:45 +0300
commitd548e65904ae43b0637d200a2441fc94e0589c30 (patch)
treebc19ab13a760684d96e6e61121d5a978e1fae2b6 /usr
parent77d0b194b2df04a1992f882d96ff4e2bd8bb8fe0 (diff)
parenta691ffb46edd7cb12a17ff0965ab59dbc95f48de (diff)
downloadlinux-d548e65904ae43b0637d200a2441fc94e0589c30.tar.xz
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost updates from Michael Tsirkin: "Features, fixes, cleanups: - discard in virtio blk - misc fixes and cleanups" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost: correct the related warning message vhost: split structs into a separate header file virtio: remove deprecated VIRTIO_PCI_CONFIG() vhost/vsock: switch to a mutex for vhost_vsock_hash virtio_blk: add discard and write zeroes support
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions