Re: linux-next: manual merge of the devicetree tree with Linus' tree

Grant Likely
2010-07-16T04:28:10Z

On Thu, Jul 15, 2010 at 7:15 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/sparc/kernel/prom_64.c between commit
> 95f72d1ed41a66f1c1c29c24d479de81a0bea36f ("lmb: rename to memblock") from
> Linus' tree and commit 035ebefc737cce56d3938e9b7eaa5ac0e9c28715
> ("of/sparc: move is_root_node() to of.h") from the devicetree tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix for
> a while.

Okay, thanks Stephen.

g.