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

[Grant Likely]

On Wed, Jan 05, 2011 at 01:35:57PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/sparc/prom/tree_32.c between commit
> 1f42be484ffc5559a29466c82adac7dd472d4439 ("sparc: remove unused prom tree
> functions") from the sparc tree and commit
> 4a3a255289e7e322b8044286cce85031990f888a ("sparc: explicitly cast
> negative phandle checks to s32") from the devicetree tree.
> 
> The former removes the code modified by the latter, so I just removed it.

Okay, thanks Stephen.

g.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/


--
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/