git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a5447e9 b443265)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 2 May 2025 07:43:44 +0000 (09:43 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 2 May 2025 07:43:44 +0000 (09:43 +0200)
commit	0c7b20b852c75836c15487752e29d8706bb571b2
tree	94e2138096277b25a47ae5be90613e2a06fe6e7e	tree
parent	a5447e92e169dafaf02fd653500105c7186d7128	commit \| diff
parent	b4432656b36e5cc1d50a1f2dc15357543add530e	commit \| diff

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

14 files changed:

arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/intel/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/intel/ds.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/intel/uncore_snbep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/bugs.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/resctrl/rdtgroup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/avic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/amd-pstate.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/intel_pstate.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)