From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 26 Feb 2024 10:06:48 +0000 (+0100)
Subject: Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2e5fc4786b7ad311393a70894c773aa106c6dbb3;p=linux.git

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>
---

2e5fc4786b7ad311393a70894c773aa106c6dbb3
diff --cc arch/x86/include/asm/coco.h
index 76c310b19b11d,21940ef8d2904..8a1cd359248f9
--- a/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
 +extern enum cc_vendor cc_vendor;
- void cc_set_mask(u64 mask);
+ 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