diff mbox series

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

Message ID 20240207153501.2c575b60@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the kvm-x86 tree with the tip tree |

Commit Message

Stephen Rothwell Feb. 7, 2024, 4:35 a.m. UTC 
  Hi all,

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

  arch/x86/kvm/svm/sev.c

between commit:

  1ca5614b84ee ("crypto: ccp: Add support to initialize the AMD-SP for SEV-SNP")

from the tip tree and commit:

  cc4ce37bed85 ("KVM: SVM: Set sev->asid in sev_asid_new() instead of overloading the return")

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.
diff mbox series

Patch

diff --cc arch/x86/kvm/svm/sev.c
index f99435b6648f,f06f9e51ad9d..000000000000
--- a/arch/x86/kvm/svm/sev.c