From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 5 Sep 2025 07:01:42 +0000 (+0200)
Subject: Merge branch 'x86/apic' into x86/sev, to resolve conflict
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0ca77f8d33e8136b8926775380506f78a8d04811;p=users%2Fhch%2Fmisc.git

Merge branch 'x86/apic' into x86/sev, to resolve conflict

 Conflicts:
	arch/x86/include/asm/sev-internal.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

0ca77f8d33e8136b8926775380506f78a8d04811
diff --cc arch/x86/include/asm/sev-internal.h
index f98f080410ad,6876655183a6..c58c47c68ab6
--- a/arch/x86/include/asm/sev-internal.h
+++ b/arch/x86/include/asm/sev-internal.h
@@@ -80,6 -97,11 +80,8 @@@ static __always_inline void sev_es_wr_g
  	native_wrmsr(MSR_AMD64_SEV_ES_GHCB, low, high);
  }
  
+ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);
+ 
 -void snp_register_ghcb_early(unsigned long paddr);
 -bool sev_es_negotiate_protocol(void);
 -bool sev_es_check_cpu_features(void);
  u64 get_hv_features(void);
  
  const struct snp_cpuid_table *snp_cpuid_get_table(void);