From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2014 21:43:17 +0000 (-0700)
Subject: Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.15-rc1~119
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64056a94256e7a476de67fbe581dfe5515c56288;p=pandora-kernel.git

Merge tag 'virtio-next-for-linus' of git://git./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
---

64056a94256e7a476de67fbe581dfe5515c56288
diff --cc drivers/block/virtio_blk.c
index 0eace43cea11,196222271a50..6d8a87f252de
--- a/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;