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

James Bottomley
2021-12-14T16:35:49Z

On Thu, 2021-11-18 at 23:16 -0500, Martin K. Petersen wrote:
> On Thu, 4 Nov 2021 11:10:53 -0700, Bart Van Assche wrote:
>
> > The following has been observed on a test setup:
> >
> > WARNING: CPU: 4 PID: 250 at drivers/scsi/ufs/ufshcd.c:2737
> > ufshcd_queuecommand+0x468/0x65c
> > Call trace:
> > ufshcd_queuecommand+0x468/0x65c
> > scsi_send_eh_cmnd+0x224/0x6a0
> > scsi_eh_test_devices+0x248/0x418
> > scsi_eh_ready_devs+0xc34/0xe58
> > scsi_error_handler+0x204/0x80c
> > kthread+0x150/0x1b4
> > ret_from_fork+0x10/0x30
> >
> > [...]
>
> 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?

James