linux-next: manual merge of the hyperv tree with the tip-fixes tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]

Hi all,

Today's linux-next merge of the hyperv tree got a conflict in:

  arch/x86/coco/sev/core.c

between commit:

  d2062cc1b1c3 ("x86/sev: Do not touch VMSA pages during SNP guest memory kdump")

from the tip-fixes tree and commit:

  266a5698a408 ("arch/x86: Provide the CPU number in the wakeup AP callback")

from the hyperv tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/coco/sev/core.c
index fae73ae5a486,7780d55d1833..000000000000
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@@ -869,12 -1166,26 +869,12 @@@ static void *snp_alloc_vmsa_page(int cp
  	return page_address(p + 1);
  }
  
- static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip)
 -static void snp_cleanup_vmsa(struct sev_es_save_area *vmsa, int apic_id)
 -{
 -	int err;
 -
 -	err = snp_set_vmsa(vmsa, NULL, apic_id, false);
 -	if (err)
 -		pr_err("clear VMSA page failed (%u), leaking page\n", err);
 -	else
 -		free_page((unsigned long)vmsa);
 -}
 -
+ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip, unsigned int cpu)
  {
  	struct sev_es_save_area *cur_vmsa, *vmsa;
 -	struct ghcb_state state;
  	struct svsm_ca *caa;
 -	unsigned long flags;
 -	struct ghcb *ghcb;
  	u8 sipi_vector;
- 	int cpu, ret;
+ 	int ret;
  	u64 cr4;
  
  	/*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]