diff options
| author | Linus Torvalds | 2019-01-02 18:54:45 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2019-01-02 18:54:45 -0800 |
| commit | d548e65904ae43b0637d200a2441fc94e0589c30 (patch) | |
| tree | bc19ab13a760684d96e6e61121d5a978e1fae2b6 /drivers/input | |
| parent | 77d0b194b2df04a1992f882d96ff4e2bd8bb8fe0 (diff) | |
| parent | a691ffb46edd7cb12a17ff0965ab59dbc95f48de (diff) | |
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 'drivers/input')
0 files changed, 0 insertions, 0 deletions