Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent...

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>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/coco.h
index 76c310b19b11d898db11cf498d7c82449bbf7dc2,21940ef8d2904baaf388228bc39c0fe1ae1b4ded..8a1cd359248f993fad129b6e379ca476f87d743d
--- 1/arch/x86/include/asm/coco.h
--- 2/arch/x86/include/asm/coco.h
+++ b/arch/x86/include/asm/coco.h
@@@ -10,9 -11,15 +11,14 @@@ enum cc_vendor 
        CC_VENDOR_INTEL,
  };
  
 -extern enum cc_vendor cc_vendor;
+ extern u64 cc_mask;
 -
  #ifdef CONFIG_ARCH_HAS_CC_PLATFORM
- void cc_set_mask(u64 mask);
 +extern enum cc_vendor cc_vendor;
+ static inline void cc_set_mask(u64 mask)
+ {
+       RIP_REL_REF(cc_mask) = mask;
+ }
+ 
  u64 cc_mkenc(u64 val);
  u64 cc_mkdec(u64 val);
  #else

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc drivers/crypto/ccp/sev-dev.c
Simple merge

diff --cc tools/arch/x86/include/asm/cpufeatures.h
Simple merge