www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:47:10 +0000 (10:47 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:47:10 +0000 (10:47 +0200)
commit	c4070e1996e05dd2eb5e08ee68d0d00553ae08f7
tree	180e4a4bae29635fd54bf7e7ca29f5e15ff0b8fc	tree
parent	7d40efd67dd313826a12dc4b03635ece97bb6d04	commit \| diff
parent	6f5bf947bab06f37ff931c359fd5770c4d9cbf87	commit \| diff

Merge commit 'its-for-linus-20250509-merge' into x86/core, to resolve conflicts

Conflicts:
Documentation/admin-guide/hw-vuln/index.rst
arch/x86/include/asm/cpufeatures.h
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c
drivers/base/cpu.c
include/linux/cpu.h

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

22 files changed:

Documentation/ABI/testing/sysfs-devices-system-cpu	diff1 \|	diff2 \|	blob \| history
Documentation/admin-guide/hw-vuln/index.rst	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/alternative.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/bugs.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ftrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/module.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/static_call.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/retpoline.S	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/base/cpu.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpu.h	diff1 \|	diff2 \|	blob \| history
tools/objtool/arch/x86/decode.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/ABI/testing/sysfs-devices-system-cpu	diff1 \|	diff2 \|	blob \| history
Documentation/admin-guide/hw-vuln/index.rst	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/alternative.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/bugs.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ftrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/module.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/static_call.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/retpoline.S	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/base/cpu.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpu.h	diff1 \|	diff2 \|	blob \| history
tools/objtool/arch/x86/decode.c	diff1 \|	diff2 \|	blob \| history