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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  include/uapi/linux/kvm.h

between commit:

  f174a9ffcd48d ("KVM: arm64: Add exit to userspace on {LD,ST}64B* outside of memslots")

from the kvm-arm tree and commit:

  fa9893fadbc24 ("KVM: Introduce KVM_EXIT_SNP_REQ_CERTS for SNP certificate-fetching")

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 --cc include/uapi/linux/kvm.h
index 88cca0e22ecea,9b96a6e73a53f..0000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -180,7 -190,7 +190,8 @@@ struct kvm_exit_snp_req_certs 
  #define KVM_EXIT_MEMORY_FAULT     39
  #define KVM_EXIT_TDX              40
  #define KVM_EXIT_ARM_SEA          41
 -#define KVM_EXIT_SNP_REQ_CERTS    42
 +#define KVM_EXIT_ARM_LDST64B      42
++#define KVM_EXIT_SNP_REQ_CERTS    43
  
  /* For KVM_EXIT_INTERNAL_ERROR */
  /* Emulate instruction failed. */

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