From: Bart Van Assche <bvanassche@acm.org>
To: James Bottomley <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Santosh Yaraganavi <santoshsy@gmail.com>,
Can Guo <cang@codeaurora.org>, Bean Huo <beanhuo@micron.com>,
Vishak G <vishak.g@samsung.com>,
Stanley Chu <stanley.chu@mediatek.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Girish K S <girish.shivananjappa@linaro.org>,
linux-scsi@vger.kernel.org, Asutosh Das <asutoshd@codeaurora.org>,
Vinayak Holikatti <vinholikatti@gmail.com>
Subject: Re: [PATCH] scsi: ufs: Improve SCSI abort handling
Date: Tue, 14 Dec 2021 09:37:53 -0800 [thread overview]
Message-ID: <1fed2928-a021-dcb9-18bb-3167fe23420a@acm.org> (raw)
In-Reply-To: <5a5cd1dde61e656e15df3767e1a6d2cc362d280d.camel@HansenPartnership.com>
On 12/14/21 8:35 AM, James Bottomley wrote:
> On Thu, 2021-11-18 at 23:16 -0500, Martin K. Petersen wrote:
>> Applied to 5.16/scsi-fixes, thanks!
>>
>> [1/1] scsi: ufs: Improve SCSI abort handling
>> https://git.kernel.org/mkp/scsi/c/3ff1f6b6ba6f
>
> OK, so now we have a conflict between fixes and queue. My impression
> is that the patch causing the conflict:
>
> https://lore.kernel.org/all/20211203231950.193369-14-bvanassche@acm.org/
>
> Actually supersedes this one, so I can simply drop the entirety of this
> patch in fixes, is that correct?
Hi James,
Commit 1fbaa02dfd05 ("scsi: ufs: Improve SCSI abort handling further") is
intended as an improvement for commit 3ff1f6b6ba6f ("scsi: ufs: core:
Improve SCSI abort handling"). Since commit 3ff1f6b6ba6f is already in
Linus' tree I don't think that it can be dropped? A possible approach is
to revert commit 3ff1f6b6ba6f before merging the mkp-scsi/for-next branch.
Thanks,
Bart.
next prev parent reply other threads:[~2021-12-14 17:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 18:10 [PATCH] scsi: ufs: Improve SCSI abort handling Bart Van Assche
2021-11-04 22:20 ` Bean Huo
[not found] ` <CGME20211104181111epcas2p2965ba25c905be783c39f098210cc4c61@epcms2p2>
2021-11-04 22:39 ` Daejun Park
2021-11-04 23:14 ` Bart Van Assche
[not found] ` <CGME20211104181111epcas2p2965ba25c905be783c39f098210cc4c61@epcms2p1>
2021-11-04 23:39 ` Daejun Park
2021-11-04 23:54 ` Bart Van Assche
[not found] ` <CGME20211104181111epcas2p2965ba25c905be783c39f098210cc4c61@epcms2p4>
2021-11-05 1:53 ` Daejun Park
2021-11-07 6:59 ` Stanley Chu
2021-11-09 4:03 ` Martin K. Petersen
2021-11-19 4:16 ` Martin K. Petersen
2021-12-14 16:35 ` James Bottomley
2021-12-14 17:37 ` Bart Van Assche [this message]
2021-12-14 17:43 ` James Bottomley
2021-12-14 17:45 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1fed2928-a021-dcb9-18bb-3167fe23420a@acm.org \
--to=bvanassche@acm.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=adrian.hunter@intel.com \
--cc=asutoshd@codeaurora.org \
--cc=beanhuo@micron.com \
--cc=cang@codeaurora.org \
--cc=girish.shivananjappa@linaro.org \
--cc=jaegeuk@kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=santoshsy@gmail.com \
--cc=stanley.chu@mediatek.com \
--cc=vinholikatti@gmail.com \
--cc=vishak.g@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.