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

Grant Likely
2010-06-07T17:04:00Z

On Sun, Jun 6, 2010 at 8:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/usb/host/ehci-hcd.c between commit
> 1f23b2d98c11fed43c552a5dbd00c793f81a8736 ("usb: fix ehci_hcd build
> failure when both generic-OF and xilinx is selected") from the  tree and
> commit 4c018c4ab1edd8f4154848868960ebe132c3d138 ("usb/of: fix build
> errors") from the devicetree tree.
>
> They look like two version of the same fix.  I used the version from
> Linus' tree.

Yup, that's right. The commit in my devicetree-next branch is stale
and has been superseeded. I just hadn't pushed out the new tree yet.
I'm refresh it today.

Cheers,
g.

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

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.