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:42:06 +0000 (10:42 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:42:06 +0000 (10:42 +0200)
commit	1f82e8e1ca18aa0b020538a3f227f5d56382638e
tree	48234576b88abf45381ae3afdd9df9d9a641e6aa	tree
parent	34be751998c1407a460efe3a20f9c4ddb8c82b9f	commit \| diff
parent	9cf78722003178b09c409df9aafe9d79e5b9a74e	commit \| diff

Merge branch 'x86/msr' into x86/core, to resolve conflicts

Conflicts:
arch/x86/boot/startup/sme.c
arch/x86/coco/sev/core.c
arch/x86/kernel/fpu/core.c
arch/x86/kernel/fpu/xstate.c

Semantic conflict:
arch/x86/include/asm/sev-internal.h

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

33 files changed:

arch/x86/boot/startup/sme.c	diff1 \|	diff2 \|	blob \| history
arch/x86/coco/sev/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/amd/ibs.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/asm.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/debugreg.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/microcode.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/sev-internal.h	diff1 \|	\|	blob \| history
arch/x86/kernel/acpi/cppc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/amd_nb.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/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mce/inject.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/topology_amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/sev.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/insn-eval.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat/memtype.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/amd_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/edac/amd64_edac.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

arch/x86/boot/startup/sme.c	diff1 \|	diff2 \|	blob \| history
arch/x86/coco/sev/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/amd/ibs.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/asm.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/debugreg.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/microcode.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/sev-internal.h	diff1 \|	\|	blob \| history
arch/x86/kernel/acpi/cppc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/amd_nb.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/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mce/inject.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/microcode/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/topology_amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/sev.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/insn-eval.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat/memtype.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/amd_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/edac/amd64_edac.c	diff1 \|	diff2 \|	blob \| history