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

2013-06-26 Thread 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/__C

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

2013-06-26 Thread Stephen Rothwell
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 fix