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>

diff --cc arch/x86/boot/compressed/sev.c
Simple merge

diff --cc arch/x86/coco/sev/core.c
Simple merge

diff --cc arch/x86/coco/sev/vc-handle.c
Simple merge

diff --cc arch/x86/include/asm/sev-internal.h
index f98f080410ad8f54961331ccac035773ee286f81,6876655183a6bb6fae3b81ae7bf93d34b28ecca4..c58c47c68ab6fe24feae3f8cd5d0ce5179b10a74
--- 1/arch/x86/include/asm/sev-internal.h
--- 2/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);
  }
  
 -void snp_register_ghcb_early(unsigned long paddr);
 -bool sev_es_negotiate_protocol(void);
 -bool sev_es_check_cpu_features(void);
+ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);
+ 
  u64 get_hv_features(void);
  
  const struct snp_cpuid_table *snp_cpuid_get_table(void);

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