Re: linux-next: manual merge of the tip tree with the pm tree

[Frederic Weisbecker]

Le Wed, Jun 03, 2026 at 02:32:34PM +0100, Mark Brown a écrit :
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/cpufreq/cpufreq_governor.c
> 
> between commit:
> 
>   24fc5870808de ("cpufreq: governor: Fix stale prev_cpu_nice spike when enabling ignore_nice_load")
> 
> from the pm tree and commit:
> 
>   080b5c6d95034 ("sched/cputime: Remove superfluous and error prone kcpustat_field() parameter")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The resolution looks good, thanks!

-- 
Frederic Weisbecker
SUSE Labs