On Wed, Aug 24, 2022 at 02:14:24PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > On Wed, Aug 24, 2022 at 07:05:25AM -0500, Mario Limonciello wrote: > > On 8/24/22 01:54, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > On Tue, Aug 23, 2022 at 08:36:20PM +0000, Limonciello, Mario wrote: > > > > [Public] > > > > > > > > > -----Original Message----- > > > > > From: gregkh@xxxxxxxxxxxxxxxxxxx <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > > Sent: Monday, August 22, 2022 03:42 > > > > > To: Natikar, Basavaraj <Basavaraj.Natikar@xxxxxxx>; > > > > > linus.walleij@xxxxxxxxxx; Limonciello, Mario <Mario.Limonciello@xxxxxxx> > > > > > Cc: stable@xxxxxxxxxxxxxxx > > > > > 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 <stable@xxxxxxxxxxxxxxx>. > > > > > > > > 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
