More axboe/patmans conflicts

diff --cc drivers/scsi/scsi.h
Simple merge

diff --cc drivers/scsi/scsi_lib.c
index 93edb6d471ba086a068cca23a6e11bb2e583d0ef,df6406a38de8d3f3d8fa37a1c0566c7a67586d8b..9e9253041e0608cf95e174a88ef8d9c1dbf387a6
--- 1/drivers/scsi/scsi_lib.c
--- 2/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -1143,17 -1157,9 +1157,6 @@@ static void scsi_request_fn(request_que
                if (blk_queue_plugged(q))
                        goto completed;
  
-               if (!scsi_dev_queue_ready(q, sdev))
 -              if (blk_queue_empty(q))
--                      goto completed;
- 
-               spin_lock_irqsave(shost->host_lock, flags);
-               if (!scsi_host_queue_ready(q, shost, sdev))
-                       goto after_host_lock;
- 
-               if (sdev->single_lun && !sdev->device_busy &&
-                   sdev->sdev_target->starget_busy)
-                       goto after_host_lock;
--
                /*
                 * get next queueable request.  We do this early to make sure
                 * that the request is fully prepared even if we cannot 

diff --cc drivers/scsi/scsi_scan.c
Simple merge