]> www.infradead.org Git - users/dwmw2/linux.git/commit
projects / users / dwmw2 / linux.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 29cd855 ee8ff87)
Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent...
authorIngo Molnar <mingo@kernel.org>
Mon, 26 Feb 2024 10:06:48 +0000 (11:06 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 26 Feb 2024 10:10:35 +0000 (11:10 +0100)
commit2e5fc4786b7ad311393a70894c773aa106c6dbb3
tree5eb9d382795a6739f1c556eaf69fdcfa6b265b7etree
parent29cd85557d8b8b3d068b5c29fdd9a0fa9ca7ef7acommit | diff
parentee8ff8768735edc3e013837c4416f819543ddc17commit | diff
Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree

We are going to queue up a number of patches that depend
on fresh changes in x86/sev - merge in that branch to
reduce the number of conflicts going forward.

Also resolve a current conflict with x86/sev.

Conflicts:
arch/x86/include/asm/coco.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/coco.h diff1 | diff2 | blob | history
arch/x86/include/asm/cpufeatures.h diff1 | diff2 | blob | history
arch/x86/include/asm/kvm_host.h diff1 | diff2 | blob | history
arch/x86/mm/fault.c diff1 | diff2 | blob | history
drivers/crypto/ccp/sev-dev.c diff1 | diff2 | blob | history
tools/arch/x86/include/asm/cpufeatures.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.