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

From: Thierry Reding <[email-masked]>
Date: Wed, 16 Oct 2013 20:51:40 +0200

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

	arch/arm/kvm/reset.c

caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and ac570e0
(ARM: kvm: rename cpu_reset to avoid name clash).

I've fixed them up (see below). Please verify that the resolution looks
good.

Thanks,
Thierry
---
diff --cc arch/arm/kvm/reset.c
index c02ba4a,d9bbd83..d153e64
--- a/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;