diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 14:42:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 14:42:49 -0700 |
| commit | b5b1de3537e2cd8f52971224a1be24bb3ce34a65 (patch) | |
| tree | cd199730744628103c36b14c878b94af4fea4735 /MAINTAINERS | |
| parent | 90de1fb83e7c760aa403381f072486fc4e3e8b5f (diff) | |
| parent | 79f800b2e76923cd8ce0aa659cb5c019d9643bc9 (diff) | |
| download | linux-b5b1de3537e2cd8f52971224a1be24bb3ce34a65.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost updates from Michael Tsirkin:
"Fixes and tweaks:
- virtio balloon page hinting support
- vhost scsi control queue
- misc fixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
MAINTAINERS: remove reference to bogus vsock file
vhost/scsi: Use common handling code in request queue handler
vhost/scsi: Extract common handling code from control queue handler
vhost/scsi: Respond to control queue operations
vhost/scsi: truncate T10 PI iov_iter to prot_bytes
virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON
mm/page_poison: expose page_poisoning_enabled to kernel modules
virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT
kvm_config: add CONFIG_VIRTIO_MENU
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 690c2f68a401..bb97067d0568 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15858,7 +15858,6 @@ F: net/vmw_vsock/virtio_transport_common.c F: net/vmw_vsock/virtio_transport.c F: drivers/net/vsockmon.c F: drivers/vhost/vsock.c -F: drivers/vhost/vsock.h F: tools/testing/vsock/ VIRTIO CONSOLE DRIVER |