Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	arch/arm/kvm/reset.c

diff --cc arch/arm/kvm/reset.c
index c02ba4af599f417113fdb2c260270ae7162575e6,d9bbd834f188031ecab5fff7af21a65fd2b9e8a6..d153e64d125505c9a8623521053fbe507db83a2f
--- 1/arch/arm/kvm/reset.c
--- 2/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@@ -62,12 -62,13 +62,13 @@@ int kvm_reset_vcpu(struct kvm_vcpu *vcp
        const struct kvm_irq_level *cpu_vtimer_irq;
  
        switch (vcpu->arch.target) {
+       case KVM_ARM_TARGET_CORTEX_A7:
        case KVM_ARM_TARGET_CORTEX_A15:
-               if (vcpu->vcpu_id > a15_max_cpu_idx)
+               if (vcpu->vcpu_id > cortexa_max_cpu_idx)
                        return -EINVAL;
-               reset_regs = &a15_regs_reset;
 -              cpu_reset = &cortexa_regs_reset;
++              reset_regs = &cortexa_regs_reset;
                vcpu->arch.midr = read_cpuid_id();
-               cpu_vtimer_irq = &a15_vtimer_irq;
+               cpu_vtimer_irq = &cortexa_vtimer_irq;
                break;
        default:
                return -ENODEV;

diff --cc arch/s390/kvm/interrupt.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

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