From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 6 May 2025 17:42:00 +0000 (+0200)
Subject: Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
X-Git-Tag: block-6.16-20250606~23^2~25^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=570d58b12fbf7bae0ba72d929ccf914a4df5ca7c;p=linux-block.git

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

570d58b12fbf7bae0ba72d929ccf914a4df5ca7c
diff --cc drivers/cpufreq/intel_pstate.c
index 2fc619ba6309,ba9bf06f1c77..db8c99535e61
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@@ -598,7 -598,10 +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);
  }