linux-next: manual merge of the arm64 tree with Linus' tree

[Stephen Rothwell]

Hi Catalin,

Today's linux-next merge of the arm64 tree got a conflict in
include/uapi/linux/kvm.h between commit 2a8fedd0c142 ("kvm: Add
definition of KVM_REG_MIPS") from Linus' tree and commit 7c8c5e6a9101
("arm64: KVM: system register handling") from the arm64 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc include/uapi/linux/kvm.h
index d88c8ee,aac2764..0000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -783,7 -784,7 +784,8 @@@ struct kvm_dirty_tlb 
  #define KVM_REG_IA64          0x3000000000000000ULL
  #define KVM_REG_ARM           0x4000000000000000ULL
  #define KVM_REG_S390          0x5000000000000000ULL
+ #define KVM_REG_ARM64         0x6000000000000000ULL
 +#define KVM_REG_MIPS          0x7000000000000000ULL
  
  #define KVM_REG_SIZE_SHIFT    52
  #define KVM_REG_SIZE_MASK     0x00f0000000000000ULL

pgpvkQPgL9J1F.pgp
Description: PGP signature