Re: [PATCH] scsi: ufs: Improve SCSI abort handling

Bart Van Assche
2021-12-14T17:37:59Z

On 12/14/21 8:35 AM, James Bottomley wrote:
> On Thu, 2021-11-18 at 23:16 -0500, Martin K. Petersen wrote:
>> Applied to 5.16/scsi-fixes, thanks!
>>
>> [1/1] scsi: ufs: Improve SCSI abort handling
>> https://git.kernel.org/mkp/scsi/c/3ff1f6b6ba6f
>
> OK, so now we have a conflict between fixes and queue. My impression
> is that the patch causing the conflict:
>
> https://lore.kernel.org/all/20211203231950.193369-14-bvanassche@acm.org/
>
> Actually supersedes this one, so I can simply drop the entirety of this
> patch in fixes, is that correct?

Hi James,

Commit 1fbaa02dfd05 ("scsi: ufs: Improve SCSI abort handling further") is
intended as an improvement for commit 3ff1f6b6ba6f ("scsi: ufs: core:
Improve SCSI abort handling"). Since commit 3ff1f6b6ba6f is already in
Linus' tree I don't think that it can be dropped? A possible approach is
to revert commit 3ff1f6b6ba6f before merging the mkp-scsi/for-next branch.

Thanks,

Bart.