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>

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/events/intel/ds.c
Simple merge

diff --cc arch/x86/events/perf_event.h
Simple merge

diff --cc drivers/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
index 2fc619ba6309c6c1b276d42b2b5ed4069454e5aa,ba9bf06f1c7736c53f31188765ef48133c0dc380..db8c99535e618944301e971d589713e921003eb0
--- 1/drivers/cpufreq/intel_pstate.c
--- 2/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;
  
 -      rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);
+       if (!cpu_feature_enabled(X86_FEATURE_IDA))
+               return true;
+ 
 +      rdmsrq(MSR_IA32_MISC_ENABLE, misc_en);
  
        return !!(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);
  }

diff --cc drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
Simple merge