From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A3F2CDB46E for ; Thu, 12 Oct 2023 17:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344076AbjJLRdU (ORCPT ); Thu, 12 Oct 2023 13:33:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344075AbjJLRdT (ORCPT ); Thu, 12 Oct 2023 13:33:19 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BF0EED for ; Thu, 12 Oct 2023 10:33:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0D70C433C8; Thu, 12 Oct 2023 17:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1697131998; bh=2L0cc9WYqX4JGRhSpiDe/HeC46/AufSsjbF68aHbtjw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=wqi35/nAzmHiaNqjtOmRP8l8knDnLUf0U1Y6JYGgaBtnQR8viKZnx2LSaz8DRLion 6oZ1J8J34bU03HLS0HxoipGSUp8R4uoqTbgBauu1v7wN70h8i10mkk4Duyxh+1r9ye La7z87yq8RRQVfEK3EVfhTFInPTdHY3ryrySE9M0= Date: Thu, 12 Oct 2023 19:33:15 +0200 From: Greg KH To: Damien Le Moal Cc: geert+renesas@glider.be, hare@suse.de, martin.petersen@oracle.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] ata: libata-scsi: Disable scsi device" failed to apply to 6.5-stable tree Message-ID: <2023101207-unlearned-shelf-c376@gregkh> References: <2023100421-numbness-pulsate-f83d@gregkh> <2023100726-puppy-gutter-23af@gregkh> <23034522-699b-425f-951c-292730a42f30@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <23034522-699b-425f-951c-292730a42f30@kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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 . > >>> > >>> 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 > >>> # > >>> git commit -s > >>> git send-email --to '' --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