Re: [GIT pull] timers/core for v6.13-rc1

[Ingo Molnar]

* Borislav Petkov <bp@xxxxxxxxx> wrote:

> On Tue, Nov 19, 2024 at 04:33:45PM -0800, Linus Torvalds wrote:
>
> > Bah. Except the vfs tree didn't take it as a shared branch, but 
> > instead cherry-picked the commits and as a result they are 
> > duplicate and caused a (trivial) merge conflict.
> 
> Yeah, we were looking at that last night with tglx and he sent me a 
> resolution (see below) and looking at your tree now, it all looks 
> correct.

So there were two conflicts: one caused by the VFS evil rebase, which 
caused a duplication of two functions within timekeeping.c.

The other conflict was an interaction with the locking tree due to 
overlapping changes, which I resolved in tip:core/merge a couple of 
weeks ago for -next:

  commit 8446247e3ddaf3b173ef96131793bab3f567bd96
  Merge: 2d4cdd3ab714 183ec5f26b2f
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Wed Nov 6 13:58:08 2024 +0100

    Merge branch 'locking/core' into core/merge, to resolve conflict
    
     Conflicts:
            kernel/time/timekeeping.c
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

AFAICT we resolved it in the same way, the only difference is that 
Linus added one more newline for readability.

So we are all good!

Thanks,

	Ingo