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

Conflicts:
	drivers/block/virtio_blk.c

diff --cc drivers/block/ataflop.c
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/char/random.c
Simple merge

diff --cc drivers/mtd/mtd_blkdevs.c
Simple merge

diff --cc drivers/mtd/ubi/block.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
index 9db097a28a74588c793c0521c7f80f8540820f61,3cc82d3dec7849e00a8a418ae736c65864e62306..a0c95cac91f0fe55681830af4477e9513ec19a32
--- 1/drivers/scsi/scsi_lib.c
--- 2/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);
  }
  

diff --cc include/linux/blk_types.h
Simple merge