From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 02:17:01 +0000 (+1000)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20140530~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf89e85223b20913415e6125f66c59b7be0532f9;p=karo-tx-linux.git

Merge remote-tracking branch 'block/for-next'

Conflicts:
	drivers/block/virtio_blk.c
---

bf89e85223b20913415e6125f66c59b7be0532f9
diff --cc drivers/scsi/scsi_lib.c
index 9db097a28a74,3cc82d3dec78..a0c95cac91f0
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -137,10 -137,9 +137,10 @@@ static void __scsi_queue_insert(struct 
  	 * lock such that the kblockd_schedule_work() call happens
  	 * before blk_cleanup_queue() finishes.
  	 */
 +	cmd->result = 0;
  	spin_lock_irqsave(q->queue_lock, flags);
  	blk_requeue_request(q, cmd->request);
- 	kblockd_schedule_work(q, &device->requeue_work);
+ 	kblockd_schedule_work(&device->requeue_work);
  	spin_unlock_irqrestore(q->queue_lock, flags);
  }