From: Greg KH <gregkh@linuxfoundation.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux@roeck-us.net, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] clocksource: Make negative motion detection more robust" failed to apply to 6.12-stable tree
Date: Thu, 12 Dec 2024 15:17:03 +0100 [thread overview]
Message-ID: <2024121232-obligate-varsity-e68f@gregkh> (raw)
In-Reply-To: <87ikrp9f59.ffs@tglx>
On Thu, Dec 12, 2024 at 02:58:42PM +0100, Thomas Gleixner wrote:
> On Thu, Dec 12 2024 at 14:03, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 6.12-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.12.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 76031d9536a076bf023bedbdb1b4317fc801dd67
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024121203-griminess-blah-4e97@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> >
> > Possible dependencies:
> >
>
> There clearly is a dependency:
>
> > From 76031d9536a076bf023bedbdb1b4317fc801dd67 Mon Sep 17 00:00:00 2001
> > From: Thomas Gleixner <tglx@linutronix.de>
> > Date: Tue, 3 Dec 2024 11:16:30 +0100
> > Subject: [PATCH] clocksource: Make negative motion detection more robust
>
> <snip>
>
> > Fixes: c163e40af9b2 ("timekeeping: Always check for negative motion")
>
> This was merged in the 6.13 merge window into Linus tree and not
> backported to 6.12.y according to my clone of the stable tree.
>
> AI went sideways?
Nope, that commit is now in all of the stable queues, which is why I
added this backport. Or attempted to.
> But I don't think these two commits are necessarily stable material,
> though I don't have a strong opinion on it. If c163e40af9b2 is
> backported, then it has it's own large dependency chain on pre 6.10
> kernels...
It's in the queues for some reason, let me figure out why...
next prev parent reply other threads:[~2024-12-12 14:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-12 13:03 FAILED: patch "[PATCH] clocksource: Make negative motion detection more robust" failed to apply to 6.12-stable tree gregkh
2024-12-12 13:58 ` Thomas Gleixner
2024-12-12 14:17 ` Greg KH [this message]
2024-12-12 14:18 ` Greg KH
2024-12-12 14:32 ` Thomas Gleixner
2024-12-12 14:35 ` Greg KH
2024-12-12 14:37 ` Greg KH
2024-12-12 15:02 ` Thomas Gleixner
2024-12-12 17:57 ` Sasha Levin
2024-12-13 11:33 ` Greg KH
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=2024121232-obligate-varsity-e68f@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=linux@roeck-us.net \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox