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

James Bottomley
2021-12-14T17:43:17Z

On Tue, 2021-12-14 at 09:37 -0800, Bart Van Assche wrote:
> 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.

I meant the effect of the fixes patch can be dropped in the merge
commit. So the sole surviving code is from the misc tree. Like what I
did at the top of the for-next branch:

https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git/commit/?h=for-next&id=014adbc9a838772b265834a55cd7b13eb2665d7e

James