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

[Linus Walleij]

On Mon, Aug 29, 2011 at 3:04 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Arnd,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-u300/Makefile.boot between commit 74b84ad6c1a5 ("ARM:
> 7022/1: allow to detect conflicting zreladdrs") from the arm tree and
> commit 732851465445 ("mach-u300: retire odd singlemem variant") from the
> arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks correct, and it's one of the unavoidable things as we clean up
the ARM tree, thanks a lot Stephen!

Yours,
Linus Walleij
--
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/