Merge branch 'x86/seves'

author Ingo Molnar <mingo@kernel.org>

Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)

committer Ingo Molnar <mingo@kernel.org>

Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)
author Ingo Molnar <mingo@kernel.org>
Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)
committer Ingo Molnar <mingo@kernel.org>
Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/mm/mem_encrypt.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 12 Apr 2021 08:27:02 +0000 (10:27 +0200)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/mem_encrypt.c	patch \|	diff1 \|	diff2 \|	blob \| history