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

From: Marc Zyngier <marc.zyngier@arm.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Austin <Jonathan.Austin@arm.com>,
	Christoffer Dall <christoffer.dall@linaro.org>,
	Olof Johansson <olof@lixom.net>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-arm tree
Date: Wed, 16 Oct 2013 19:58:04 +0100	[thread overview]
Message-ID: <525EE1BC.3050605@arm.com> (raw)
In-Reply-To: <1381949500-501-3-git-send-email-treding@nvidia.com>

On 16/10/13 19:51, Thierry Reding wrote:
> 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.

Looks good to me (I have the same resolution in my own tree).

Thanks Thierry.

	M.

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

-- 
Jazz is not dead. It just smells funny...