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 09553C00140 for ; Wed, 24 Aug 2022 12:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237404AbiHXMXa (ORCPT ); Wed, 24 Aug 2022 08:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237373AbiHXMX2 (ORCPT ); Wed, 24 Aug 2022 08:23:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FA438C46E for ; Wed, 24 Aug 2022 05:23:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1B4346192C for ; Wed, 24 Aug 2022 12:23:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07588C433C1; Wed, 24 Aug 2022 12:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661343806; bh=F+Am3dYYKWZmRjtqIJ/FVkXqudx81A6AhQRDAr2o5jE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R1GjiJNFaVg1s/TApeacYFZkPNij/uC5HC8UoopFpFhV/rCADSF/5Y3MQeH9okt7u XN8IdFxI5zEYEVeybEgIN549qjfzQ185LZ2XgsWYqEQAljWwgotvraWvX2lH/LWdh5 vdsN3tHnQx7v/UW3PMjceYPBiJQoQswvfkaIGfHo= Date: Wed, 24 Aug 2022 14:23:23 +0200 From: "gregkh@linuxfoundation.org" To: Mario Limonciello Cc: "stable@vger.kernel.org" , "Natikar, Basavaraj" , "linus.walleij@linaro.org" Subject: Re: FAILED: patch "[PATCH] pinctrl: amd: Don't save/restore interrupt status and wake" failed to apply to 5.10-stable tree Message-ID: References: <166115772810989@kroah.com> <6ce41d24-5eed-5ffc-d4ee-3dd702833347@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Aug 24, 2022 at 02:14:24PM +0200, gregkh@linuxfoundation.org wrote: > On Wed, Aug 24, 2022 at 07:05:25AM -0500, Mario Limonciello wrote: > > On 8/24/22 01:54, gregkh@linuxfoundation.org wrote: > > > On Tue, Aug 23, 2022 at 08:36:20PM +0000, Limonciello, Mario wrote: > > > > [Public] > > > > > > > > > -----Original Message----- > > > > > From: gregkh@linuxfoundation.org > > > > > Sent: Monday, August 22, 2022 03:42 > > > > > To: Natikar, Basavaraj ; > > > > > linus.walleij@linaro.org; Limonciello, Mario > > > > > Cc: stable@vger.kernel.org > > > > > Subject: FAILED: patch "[PATCH] pinctrl: amd: Don't save/restore interrupt > > > > > status and wake" failed to apply to 5.10-stable tree > > > > > > > > > > > > > > > The patch below does not apply to the 5.10-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 . > > > > > > > > I had a look at this and the other ones that failed to apply. I tried to apply this commit > > > > ( commit b8c824a869f220c6b46df724f85794349bafbf23 ) to all of them and then built it. > > > > > > > > 5.10.y: success > > > > > > $ patch -p1 < ../pinctrl-amd-don-t-save-restore-interrupt-status-and-wake-status-bits.patch > > > patching file drivers/pinctrl/pinctrl-amd.c > > > Hunk #1 succeeded at 833 (offset -85 lines). > > > Hunk #2 FAILED at 927. > > > Hunk #3 FAILED at 937. > > > Hunk #4 succeeded at 842 (offset -103 lines). > > > 2 out of 4 hunks FAILED -- saving rejects to file drivers/pinctrl/pinctrl-amd.c.rej > > > > > > Doesn't work for me, how did you apply it? > > > > I checked out the different branches mentioned and did "git cherry-pick -x > > b8c824a869f220c6b46df724f85794349bafbf23" followed by building. > > That's great, can you send me that patch? We don't use git for the > stable queue as it does not work at all for our development workflow. > We export the commits as patches and then apply them using quilt. git > must be doing some "magic fuzzing" here that patch can not detect. Nevermind, I did that, and it worked, odd that patch is confused, the fuzz is fine, just the line numbers are off. I'll queue this up after this round of kernels is released. thanks, greg k-h