Messages in this thread | | | Date | Mon, 14 Sep 2020 13:00:30 +0800 | From | Can Guo <> | Subject | Re: [PATCH v2 1/2] scsi: ufs: Abort tasks before clear them from doorbell |
| |
On 2020-09-11 17:09, Bean Huo wrote: > On Fri, 2020-09-11 at 02:16 +0000, Can Guo wrote: >> > > >> > > 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. > > I mentioned here https://patchwork.kernel.org/patch/11734713/ > > this change (scsi: ufs: Abort tasks before clearing them from doorbell) > has conflicts with the scsi-fixes branch. I don't know which branch is > the main branch we should focus on. > > > Bean
Yeah, I know that one, but I was not even working on scsi-fixes branch at that time. Now I have two more fixes to ufshcd_abort(), not sure which branch I should work on, so asking the same here.
Regards,
Can Guo.
| |