diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 17:43:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 17:43:17 -0400 |
commit | 64056a94256e7a476de67fbe581dfe5515c56288 (patch) | |
tree | c7600775771bcacc42df0e17f540c9f9c9edc798 /MAINTAINERS | |
parent | 7474043eff6f7c20141b2f49f774d0aab6542220 (diff) | |
parent | fc4324b4597c4eb8907207e82f9a6acec84dd335 (diff) |
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio updates from Rusty Russell:
"Nothing exciting: virtio-blk users might see a bit of a boost from the
doubling of the default queue length though"
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio-blk: base queue-depth on virtqueue ringsize or module param
Revert a02bbb1ccfe8: MAINTAINERS: add virtio-dev ML for virtio
virtio: fail adding buffer on broken queues.
virtio-rng: don't crash if virtqueue is broken.
virtio_balloon: don't crash if virtqueue is broken.
virtio_blk: don't crash, report error if virtqueue is broken.
virtio_net: don't crash if virtqueue is broken.
virtio_balloon: don't softlockup on huge balloon changes.
virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()
MAINTAINERS: virtio-dev is subscribers only
tools/virtio: add a missing )
tools/virtio: fix missing kmemleak_ignore symbol
tools/virtio: update internal copies of headers
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e2ed69f1c430..ee175ff17256 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9432,7 +9432,6 @@ F: include/media/videobuf2-* | |||
9432 | 9432 | ||
9433 | VIRTIO CONSOLE DRIVER | 9433 | VIRTIO CONSOLE DRIVER |
9434 | M: Amit Shah <amit.shah@redhat.com> | 9434 | M: Amit Shah <amit.shah@redhat.com> |
9435 | L: virtio-dev@lists.oasis-open.org | ||
9436 | L: virtualization@lists.linux-foundation.org | 9435 | L: virtualization@lists.linux-foundation.org |
9437 | S: Maintained | 9436 | S: Maintained |
9438 | F: drivers/char/virtio_console.c | 9437 | F: drivers/char/virtio_console.c |
@@ -9442,7 +9441,6 @@ F: include/uapi/linux/virtio_console.h | |||
9442 | VIRTIO CORE, NET AND BLOCK DRIVERS | 9441 | VIRTIO CORE, NET AND BLOCK DRIVERS |
9443 | M: Rusty Russell <rusty@rustcorp.com.au> | 9442 | M: Rusty Russell <rusty@rustcorp.com.au> |
9444 | M: "Michael S. Tsirkin" <mst@redhat.com> | 9443 | M: "Michael S. Tsirkin" <mst@redhat.com> |
9445 | L: virtio-dev@lists.oasis-open.org | ||
9446 | L: virtualization@lists.linux-foundation.org | 9444 | L: virtualization@lists.linux-foundation.org |
9447 | S: Maintained | 9445 | S: Maintained |
9448 | F: drivers/virtio/ | 9446 | F: drivers/virtio/ |
@@ -9455,7 +9453,6 @@ F: include/uapi/linux/virtio_*.h | |||
9455 | VIRTIO HOST (VHOST) | 9453 | VIRTIO HOST (VHOST) |
9456 | M: "Michael S. Tsirkin" <mst@redhat.com> | 9454 | M: "Michael S. Tsirkin" <mst@redhat.com> |
9457 | L: kvm@vger.kernel.org | 9455 | L: kvm@vger.kernel.org |
9458 | L: virtio-dev@lists.oasis-open.org | ||
9459 | L: virtualization@lists.linux-foundation.org | 9456 | L: virtualization@lists.linux-foundation.org |
9460 | L: netdev@vger.kernel.org | 9457 | L: netdev@vger.kernel.org |
9461 | S: Maintained | 9458 | S: Maintained |