]> www.infradead.org Git - linux.git/commit
Merge tag 'v6.15-rc5' into x86/msr, to pick up fixes and to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 6 May 2025 17:42:00 +0000 (19:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 6 May 2025 17:42:00 +0000 (19:42 +0200)
commit570d58b12fbf7bae0ba72d929ccf914a4df5ca7c
treedfed4e4970ba5a5a4c4c726b4d55d9f4394683c3
parent502ad6e5a6196840976c4c84b2ea2f9769942fbe
parent92a09c47464d040866cf2b4cd052bc60555185fb
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>
arch/x86/events/core.c
arch/x86/events/intel/core.c
arch/x86/events/intel/ds.c
arch/x86/events/perf_event.h
drivers/cpufreq/acpi-cpufreq.c
drivers/cpufreq/intel_pstate.c
drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c