Subject: linux-next: manual merge of the kvm-arm tree

From: Thierry Reding <[email-masked]>
Date: Fri, 25 Oct 2013 15:03:43 +0200

Today's linux-next merge of the kvm-arm tree got a conflict in

	arch/arm/kvm/reset.c

caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and 7999b4d
(ARM: KVM: drop limitation to 4 CPU VMs).

I fixed it up (see below). Please verify that the resolution looks good.

Thanks,
Thierry
---
diff --cc arch/arm/kvm/reset.c
index d153e64,2c5add0..f558c07
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@@ -64,9 -62,7 +62,7 @@@ int kvm_reset_vcpu(struct kvm_vcpu *vcp
  	switch (vcpu->arch.target) {
  	case KVM_ARM_TARGET_CORTEX_A7:
  	case KVM_ARM_TARGET_CORTEX_A15:
- 		if (vcpu->vcpu_id > cortexa_max_cpu_idx)
- 			return -EINVAL;
 -		cpu_reset = &cortexa_regs_reset;
 +		reset_regs = &cortexa_regs_reset;
  		vcpu->arch.midr = read_cpuid_id();
  		cpu_vtimer_irq = &cortexa_vtimer_irq;
  		break;