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

[Grant Likely]

On Tuesday, May 18, 2010, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/net/gianfar.c between commit
> b14ed884df5968b0977114ebd5a22f58d0d15315 ("gianfar: Remove legacy PM
> callbacks") from the net tree and commit
> 030d1870b731924034caf0c874981e2ed4f1becc ("drivers/net/of: don't use
> deprecated field in of_platform_driver") from the devicetree tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks right to me.  I'll probably wait until this and the other
conflicting trees are merged by Linus before I send him my pull
request so I can include the fixups.

Thanks,
g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
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/