Merge tag 'v6.15-rc4' into x86/msr, to pick up fixes and resolve conflicts

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
index 394fa83b537bbc6852e6cffffb63a1fb31944872,00dfe487bd00ea81ec7e64d9871bc03b70133b47..9ef3577d4b35581942bf76df6f1f0bdef95762e2
--- 1/arch/x86/events/intel/core.c
--- 2/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@@ -3103,7 -3101,16 +3101,16 @@@ static int handle_pmi_common(struct pt_
                 * Update the MSR if pebs_enabled is changed.
                 */
                if (pebs_enabled != cpuc->pebs_enabled)
 -                      wrmsrl(MSR_IA32_PEBS_ENABLE, cpuc->pebs_enabled);
 +                      wrmsrq(MSR_IA32_PEBS_ENABLE, cpuc->pebs_enabled);
+ 
+               /*
+                * Above PEBS handler (PEBS counters snapshotting) has updated fixed
+                * counter 3 and perf metrics counts if they are in counter group,
+                * unnecessary to update again.
+                */
+               if (cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS] &&
+                   is_pebs_counter_event_group(cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS]))
+                       status &= ~GLOBAL_STATUS_PERF_METRICS_OVF_BIT;
        }
  
        /*

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

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

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/bugs.c
Simple merge

diff --cc arch/x86/kernel/cpu/microcode/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/rdtgroup.c
Simple merge

diff --cc arch/x86/kvm/svm/avic.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/mm/tlb.c
Simple merge

diff --cc drivers/cpufreq/amd-pstate.c
index fd1ae77142ad832315fc6a88a7029b54e9ca62b2,b961f3a3b58059691ad169ed265b08fddf9f60d0..20f00cffaf13f8765267088fe91a81b51e0e287a
--- 1/drivers/cpufreq/amd-pstate.c
--- 2/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@@ -788,19 -791,9 +791,9 @@@ exit_err
  
  static void amd_perf_ctl_reset(unsigned int cpu)
  {
 -      wrmsrl_on_cpu(cpu, MSR_AMD_PERF_CTL, 0);
 +      wrmsrq_on_cpu(cpu, MSR_AMD_PERF_CTL, 0);
  }
  
- /*
-  * Set amd-pstate preferred core enable can't be done directly from cpufreq callbacks
-  * due to locking, so queue the work for later.
-  */
- static void amd_pstste_sched_prefcore_workfn(struct work_struct *work)
- {
-       sched_set_itmt_support();
- }
- static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn);
- 
  #define CPPC_MAX_PERF U8_MAX
  
  static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)

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