On Sun, 2017-06-18 at 14:26 -0600, Jens Axboe wrote:
> On Tue, Jun 13 2017, Ming Lei wrote:
> > If you are fine with 3-12, could you consider it for v4.13?
> >
> > The fixes on uses of blk_mq_tagset_busy_iter() depends on
> > this patchset.
>
> Yes, I think it looks fine. I've applied the rest, except the nvme
> patch, which no longer applies since start/stop changes have been made
> there. Please resend that one against for-4.13/block, thanks.
Hello Jens,
Are you aware that these changes conflict with Martin's 4.13/scsi-queue
branch? Who should work on resolving this conflict?
$ git checkout mkp-scsi/4.13/scsi-queue -b mkp-scsi-for-v4.13
$ git fetch axboe-block
$ git merge axboe-block/for-4.13/block
Removing fs/xfs/uuid.h
Removing fs/xfs/uuid.c
Auto-merging drivers/scsi/scsi_lib.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c
Auto-merging drivers/scsi/scsi_error.c
Automatic merge failed; fix conflicts and then commit the result.
$ PAGER= git diff
diff --cc drivers/scsi/scsi_lib.c
index 41c19c75dab4,fb18ed284e55..000000000000
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -2989,7 -2959,10 +2974,14 @@@ int scsi_internal_device_block_nowait(s
* request queue.
*/
if (q->mq_ops) {
++<<<<<<< HEAD
+ blk_mq_stop_hw_queues(q);
++=======
+ if (wait)
+ blk_mq_quiesce_queue(q);
+ else
+ blk_mq_quiesce_queue_nowait(q);
++>>>>>>> axboe-block/for-4.13/block
} else {
spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q);
@@@ -3086,7 -3015,13 +3078,17 @@@ int scsi_internal_device_unblock_nowait
sdev->sdev_state != SDEV_OFFLINE)
return -EINVAL;
++<<<<<<< HEAD
+ scsi_start_queue(sdev);
++=======
+ if (q->mq_ops) {
+ blk_mq_unquiesce_queue(q);
+ } else {
+ spin_lock_irqsave(q->queue_lock, flags);
+ blk_start_queue(q);
+ spin_unlock_irqrestore(q->queue_lock, flags);
+ }
++>>>>>>> axboe-block/for-4.13/block
return 0;
}
Bart.
