linux-next: manual merge of the kvm-x86 tree with the kvm tree

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

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

Hi all,

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

  arch/x86/kvm/svm/svm.c

between commit:

  605bbdc12bc8 ("KVM: SEV: store VMSA features in kvm_sev_info")

from the kvm tree and commit:

  c92be2fd8edf ("KVM: SVM: Save/restore non-volatile GPRs in SEV-ES VMRUN via host save area")

from the kvm-x86 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/kvm/svm/svm.c
index 0f3b59da0d4a,9aaf83c8d57d..000000000000
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1511,12 -1524,8 +1516,8 @@@ static void svm_prepare_switch_to_guest
  	 * or subsequent vmload of host save area.
  	 */
  	vmsave(sd->save_area_pa);
- 	if (sev_es_guest(vcpu->kvm)) {
- 		struct sev_es_save_area *hostsa;
- 		hostsa = (struct sev_es_save_area *)(page_address(sd->save_area) + 0x400);
- 
- 		sev_es_prepare_switch_to_guest(svm, hostsa);
- 	}
+ 	if (sev_es_guest(vcpu->kvm))
 -		sev_es_prepare_switch_to_guest(sev_es_host_save_area(sd));
++		sev_es_prepare_switch_to_guest(svm, sev_es_host_save_area(sd));
  
  	if (tsc_scaling)
  		__svm_write_tsc_multiplier(vcpu->arch.tsc_scaling_ratio);

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