Hi James and Stanley,
On 2020-09-11 00:09, James Bottomley wrote:
On Thu, 2020-09-10 at 16:18 +0800, Stanley Chu wrote:
[...]
> + if (!err) {
> +cleanup:
Yeah, considering Bean Huo's patch "scsi: ufs: No need to send Abort
Task if the task in DB was cleared", "cleanup" label shall be added
back here.
So your resolution looks good to me.
Thanks so much : )
You're welcome ... but just remember I have to explain this to Linus
when the merge window opens. It would be a lot easier if this hadn't
happened so please don't make it any worse ...
James
Sorry that my changes got you confused and thank you for help resolve
the
conflicts. My change ("scsi: ufs: Abort tasks before clearing them from
doorbell") is to serve my fixes to ufs error recovery which only got
picked
up on scsi-queue-5.10. So I checked out to scsi-queue-5.10 and made my
changes on the tip of scsi-queue-5.10, below 2 changes were not even
present in scsi-queue-5.10 back that time.
scsi: ufs: Clean up completed request without interrupt notification
scsi: ufs: No need to send Abort Task if the task in DB was cleared
Is there anything wrong with my work flow above? Please let me know the
right process so that I can avoid such conflicts in my next changes,
which
also touch the func ufshcd_abort(). Thanks!
Regards,
Can Guo.
