Re: [PATCH v5 00/12] blk-mq: fix & improve queue quiescing

Jens Axboe
2017-06-18T23:48:05Z

On 06/18/2017 05:05 PM, Bart Van Assche wrote:
> 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?

Nope. Not a huge problem - send it to Stephen since -next will see this
conflict shortly. And then Martin should keep it handy for sending his
pull request to Linus, as I always ship early.

Longer term, basing the scsi tree on the block tree might not be a bad
idea...

--
Jens Axboe