Merge tag 'kvm-arm-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

KVM/ARM updates for 4.6

- VHE support so that we can run the kernel at EL2 on ARMv8.1 systems
- PMU support for guests
- 32bit world switch rewritten in C
- Various optimizations to the vgic save/restore code

Conflicts:
	include/uapi/linux/kvm.h

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc arch/x86/kvm/paging_tmpl.h
Simple merge

diff --cc include/uapi/linux/kvm.h
index c251f06f4e119b65a9075fdbd5086b96c691d48d,50f44a229212537d8c7bbe1b246f745c231f9f5e..a7f1f8032ec1fbcb27bc452d818a71269af81a2e
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -862,7 -850,8 +862,9 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
  #define KVM_CAP_HYPERV_SYNIC 123
  #define KVM_CAP_S390_RI 124
 -#define KVM_CAP_ARM_PMU_V3 125
 -#define KVM_CAP_VCPU_ATTRIBUTES 126
 +#define KVM_CAP_SPAPR_TCE_64 125
++#define KVM_CAP_ARM_PMU_V3 126
++#define KVM_CAP_VCPU_ATTRIBUTES 127
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

diff --cc virt/kvm/async_pf.c
Simple merge