arch/x86/include/asm/cpufeatures.h · 2e5fc4786b7ad311393a70894c773aa106c6dbb3 · Kirill Smelkov / linux

You need to sign in or sign up before continuing.

Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree · 2e5fc478

Ingo Molnar authored Feb 26, 2024



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>

2e5fc478

cpufeatures.h 33.2 KB

Replace cpufeatures.h