Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/cpufreq/intel_pstate.c

between commit:

  ac4e04d9e378 ("cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode")

from the pm tree and commit:

  c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/cpufreq/intel_pstate.c
index 25830e5d76e8,2fc619ba6309..000000000000
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@@ -598,10 -598,7 +598,10 @@@ static bool turbo_is_disabled(void
  {
  	u64 misc_en;
  
 +	if (!cpu_feature_enabled(X86_FEATURE_IDA))
 +		return true;
 +
- 	rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);
+ 	rdmsrq(MSR_IA32_MISC_ENABLE, misc_en);
  
  	return !!(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);
  }

Hi,

On 5/1/2025 5:58 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>    drivers/cpufreq/intel_pstate.c
>
> between commit:
>
>    ac4e04d9e378 ("cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode")

This one has been merged into 6.15-rc5.


> from the pm tree and commit:
>
>    c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")

So this one will clash with the mainline now.


> 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.

Thanks for the report!

* Wysocki, Rafael J <rafael.j.wysocki@intel.com> wrote:

> >    ac4e04d9e378 ("cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode")
> 
> This one has been merged into 6.15-rc5.
> 
> 
> > from the pm tree and commit:
> > 
> >    c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")
> 
> So this one will clash with the mainline now.

Yeah - and I resolved it in tip:x86/msr:

  commit 570d58b12fbf7bae0ba72d929ccf914a4df5ca7c (HEAD -> x86/msr)
  Merge: 502ad6e5a619 92a09c47464d
  Author: Ingo Molnar <mingo@kernel.org>
  Date:   Tue May 6 19:42:00 2025 +0200

    Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
    
     Conflicts:
            drivers/cpufreq/intel_pstate.c
    
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

So all should be good at this stage.

Thanks,

	Ingo