Re: FAILED: patch "[PATCH] ata: libata-scsi: Disable scsi device" failed to apply to 6.5-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Thu, Oct 12, 2023 at 11:36:50AM +0900, Damien Le Moal wrote:
> On 10/7/23 20:35, Greg KH wrote:
> > On Thu, Oct 05, 2023 at 08:50:27AM +0900, Damien Le Moal wrote:
> >> On 10/4/23 23:58, gregkh@linuxfoundation.org wrote:
> >>>
> >>> The patch below does not apply to the 6.5-stable tree.
> >>> If someone wants it applied there, or to any other stable or longterm
> >>> tree, then please email the backport, including the original git commit
> >>> id to <stable@vger.kernel.org>.
> >>>
> >>> To reproduce the conflict and resubmit, you may use the following commands:
> >>>
> >>> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y
> >>> git checkout FETCH_HEAD
> >>> git cherry-pick -x aa3998dbeb3abce63653b7f6d4542e7dcd022590
> >>> # <resolve conflicts, build, test, etc.>
> >>> git commit -s
> >>> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023100421-numbness-pulsate-f83d@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^..
> >>>
> >>> Possible dependencies:
> >>
> >> commit 3cc2ffe5c16dc65dfac354bc5b5bc98d3b397567
> > 
> > Ok, but that commit does not apply to 6.5.y either :(
> > 
> > Can you send a working set of backports for 6.5.y if you want to see
> > this change there?
> 
> Hi Greg,
> 
> It looks like all the needed dependencies are now backported and this is the
> last fix patch that was needed. I did the above "git send-email ..." to send
> you the backport for 6.5.y and did the same for 6.1.y.

Both now queued up, thanks!

greg k-h