Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/virtio_blk.c
index 0eace43cea113159d9e94fc75e1710049d0e0c00,196222271a50a295cbbdbbc3e5b423179bdfc6c7..6d8a87f252de563f1251872e5bccbd25e2e64cf7
--- 1/drivers/block/virtio_blk.c
--- 2/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -489,8 -495,9 +495,9 @@@ static struct blk_mq_reg virtio_mq_reg 
        .numa_node      = NUMA_NO_NODE,
        .flags          = BLK_MQ_F_SHOULD_MERGE,
  };
+ module_param_named(queue_depth, virtio_mq_reg.queue_depth, uint, 0444);
  
 -static void virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx,
 +static int virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx,
                             struct request *rq, unsigned int nr)
  {
        struct virtio_blk *vblk = data;

diff --cc drivers/net/virtio_net.c
Simple merge