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

[Borislav Petkov]

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.

commit 6a972393d45dbe3df1e57e2360661990d22c8369
Merge: 183ec5f26b2f cdc905d16b07
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date:   Tue Nov 19 20:58:25 2024 +0100

    Merge branch 'timers/core' into tmp
    
    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

diff --cc kernel/cpu.c
index c4aaf73dec9e,895f3287e3f3..6e34b52cb5ce
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@@ -1338,9 -1338,6 +1338,8 @@@ static int takedown_cpu(unsigned int cp
  
  	cpuhp_bp_sync_dead(cpu);
  
 +	lockdep_cleanup_dead_cpu(cpu, idle_thread_get(cpu));
- 	tick_cleanup_dead_cpu(cpu);
 +
  	/*
  	 * Callbacks must be re-integrated right away to the RCU state machine.
  	 * Otherwise an RCU callback could block a further teardown function
diff --cc kernel/time/timekeeping.c
index 18752983e834,d115adebc418..0ca85ff4fbb4
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -445,11 -375,11 +377,11 @@@ static __always_inline u64 __ktime_get_
  	u64 now;
  
  	do {
 -		seq = raw_read_seqcount_latch(&tkf->seq);
 +		seq = read_seqcount_latch(&tkf->seq);
  		tkr = tkf->base + (seq & 0x01);
  		now = ktime_to_ns(tkr->base);
- 		now += __timekeeping_get_ns(tkr);
+ 		now += timekeeping_get_ns(tkr);
 -	} while (raw_read_seqcount_latch_retry(&tkf->seq, seq));
 +	} while (read_seqcount_latch_retry(&tkf->seq, seq));
  
  	return now;
  }

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette