Can,
Do you know when can this change be picked up in scsi-queue-5.10?
If I push my fixes to ufshcd_abort() on scsi-queue-5.10, they will
run into conflicts with this one again, right? How should I move
forward now?
You should be able to use 5.10/scsi-queue as baseline now.
For 5.11 I think I'll do a separate branch for UFS.