Re: linux-next: manual merge of the cpuinit tree with the arm-currenttree

[Gregory CLEMENT]

On 06/26/2013 09:12 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the cpuinit tree got a conflict in arch/arm/mm/proc-v7.S between commit 3e0a07f8c401 ("ARM: 7773/1: PJ4B: Add support for errata 4742") from the arm-current
> tree and commit "arm: delete __cpuinit/__CPUINIT usage from all ARM users" from the cpuinit tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action is required).
> 
>From my point of view it looks good.
Thanks,
-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/