On Fri, May 5, 2017 at 9:47 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> @@ -164,7 +158,11 @@ __after_proc_init:
> #endif
> mcr p15, 0, r0, c1, c0, 0 @ write control reg
> #endif /* CONFIG_CPU_CP15 */
> +<<<<<<< HEAD
> mov pc, r13
> +=======
> + ret lr
> +>>>>>>> 12ebe5ca67dc... ARM: 8383/1: nommu: avoid deprecated source register on mov
> ENDPROC(__after_proc_init)
> .ltorg
>
This was evidently crap, please ignore this patch.
Arnd