Re: FAILED: patch "[PATCH] clocksource: Make negative motion detection more robust" failed to apply to 6.12-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Thu, Dec 12, 2024 at 04:02:06PM +0100, Thomas Gleixner wrote:
> On Thu, Dec 12 2024 at 15:37, Greg KH wrote:
> > On Thu, Dec 12, 2024 at 03:35:14PM +0100, Greg KH wrote:
> >> On Thu, Dec 12, 2024 at 03:32:24PM +0100, Thomas Gleixner wrote:
> >> > On Thu, Dec 12 2024 at 15:18, Greg KH wrote:
> >> > > On Thu, Dec 12, 2024 at 03:17:03PM +0100, Greg KH wrote:
> >> > >> > 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...
> >> > >
> >> > > Ah, it was an AUTOSEL thing, I'll go drop it from all queues except
> >> > > 6.12.y for now, thanks.
> >> > >
> >> > > But, for 6.12.y, we want this fixup too, right?
> >> > 
> >> > If you have c163e40af9b2 pulled back into 6.12.y, then yes. I don't know
> >> > why this actually rejects. I just did
> >> > 
> >> > git-cherry-pick c163e40af9b2
> >> > git-cherry-pick 51f109e92935
> >> > 
> >> > on top of v6.12.4 and that just worked fine.
> >> 
> >> The build breaks :(
> >
> > To be specific:
> >
> > kernel/time/timekeeping.c: In function ‘timekeeping_debug_get_ns’:
> > kernel/time/timekeeping.c:263:17: error: too few arguments to function ‘clocksource_delta’
> >   263 |         delta = clocksource_delta(now, last, mask);
> >       |                 ^~~~~~~~~~~~~~~~~
> > In file included from kernel/time/timekeeping.c:30:
> 
> Ah. You also need:
> 
> d44d26987bb3 ("timekeeping: Remove CONFIG_DEBUG_TIMEKEEPING")
> 
> which in turn does not apply cleanly and needs the backport
> below. *shrug*

Wonderful, thanks for this, that worked I'll go push out a -rc2 with
this soon.

greg k-h