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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Zz3QRpWq2alIhA7j@gmail.com>
Date: Wed, 20 Nov 2024 13:04:22 +0100
From: Ingo Molnar <mingo@...nel.org>
To: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Christian Brauner <brauner@...nel.org>,
	linux-kernel@...r.kernel.org, x86@...nel.org,
	Peter Zijlstra <peterz@...radead.org>
Subject: Re: [GIT pull] timers/core for v6.13-rc1


* Borislav Petkov <bp@...en8.de> 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@...nel.org>
  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@...nel.org>

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