[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <d151d6a2b53cfbd7bf3f9c9313b49c4c404c4c5a.camel@gmail.com>
Date: Fri, 11 Sep 2020 11:09:26 +0200
From: Bean Huo <huobean@...il.com>
To: Can Guo <cang@...eaurora.org>,
James Bottomley <James.Bottomley@...senpartnership.com>
Cc: Stanley Chu <stanley.chu@...iatek.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
asutoshd@...eaurora.org, nguyenb@...eaurora.org,
hongwus@...eaurora.org, ziqichen@...eaurora.org,
rnayak@...eaurora.org, linux-scsi@...r.kernel.org,
kernel-team@...roid.com, saravanak@...gle.com, salyzyn@...gle.com,
Alim Akhtar <alim.akhtar@...sung.com>,
Avri Altman <avri.altman@....com>,
Matthias Brugger <matthias.bgg@...il.com>,
Bean Huo <beanhuo@...ron.com>,
Bart Van Assche <bvanassche@....org>,
open list <linux-kernel@...r.kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-arm-kernel@...ts.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@...ts.infradead.org>
Subject: Re: [PATCH v2 1/2] scsi: ufs: Abort tasks before clear them from
doorbell
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
Powered by blists - more mailing lists