Re: [GIT pull] timers/nohz for v7.2-rc1

[Ingo Molnar]

* Thomas Gleixner <tglx@xxxxxxxxxx> wrote:

> Linus,
> 
> please pull the latest timers/nohz branch from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-nohz-2026-06-13
> 
> up to:  6199f9999a9b: sched/cputime: Handle dyntick-idle steal time correctly
> 
> Updates for the NOHZ subsystem:

Merge note: there's a new conflict with the cpufreq tree which
is already upstream:

     Conflicts:
            drivers/cpufreq/cpufreq_governor.c

Due to these commits:

  080b5c6d9503 ("sched/cputime: Remove superfluous and error prone kcpustat_field() parameter")

  24fc5870808d ("cpufreq: governor: Fix stale prev_cpu_nice spike when enabling ignore_nice_load")

It's just overlapping changes, the resolution is to remove the
first argument of all 3 uses of kcpustat_field() from the cpufreq
version of the file, like 080b5c6d9503 does.

Thanks,

	Ingo