Hi Martin, Can, On Wed, 2020-09-09 at 22:32 -0400, Martin K. Petersen wrote: > Can and Stanley, > > > I can't reconcile this hunk: > > Please provide a resolution for these conflicting commits in fixes and > queue: > > 307348f6ab14 scsi: ufs: Abort tasks before clearing them from doorbell > > b10178ee7fa8 scsi: ufs: Clean up completed request without interrupt > notification > Can's patch has considered my fix in the new flow. To be more clear, for the fixing case in my patch, ufshcd_try_to_abort_task() will return 0 (err = 0) and finally the target tag can be completed and cleared by __ufshcd_transfer_req_compl() in Can's new flow. Thus I think the resolution can just using the code in Can's patch. Can, please correct me if I was wrong. Thanks, Stanley Chu > Thanks! >
