From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 9 Mar 2016 10:50:42 +0000 (+0100)
Subject: Merge tag 'kvm-arm-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab92f30875a7ec3e84644a5494febd8901e66742;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'kvm-arm-for-4.6' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

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
---

ab92f30875a7ec3e84644a5494febd8901e66742
diff --cc include/uapi/linux/kvm.h
index c251f06f4e11,50f44a229212..a7f1f8032ec1
--- a/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