Merge remote-tracking branch 'arm64/upstream'

Conflicts:
	include/uapi/linux/kvm.h

diff --cc MAINTAINERS
Simple merge

diff --cc include/uapi/linux/kvm.h
index d88c8ee00c8b7b39cc935c8353bc7f4f3eb3c8bf,aac27640bec257f37f29b38d7efb195eaefd68dd..acccd08be6c7563f6c2c316f6c2530563a7d3cb5
--- 1/include/uapi/linux/kvm.h
--- 2/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