From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Mon, 7 Jun 2010 11:03:35 -0600 [thread overview]
Message-ID: <AANLkTinfvexAjfzrLtQXqqCLIqootCGhaVLmajLC8rtO@mail.gmail.com> (raw)
In-Reply-To: <20100607125343.cd109629.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2010-06-07 17:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-07 2:53 linux-next: manual merge of the devicetree tree with Linus' tree Stephen Rothwell
2010-06-07 17:03 ` Grant Likely [this message]
2010-07-16 1:15 Stephen Rothwell
2010-07-16 4:27 ` Grant Likely
2011-08-05 2:13 Stephen Rothwell
2017-09-06 2:55 Stephen Rothwell
2017-09-06 3:01 Stephen Rothwell
2019-02-14 3:02 Stephen Rothwell
2019-06-24 5:51 Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell
2019-07-24 3:02 Stephen Rothwell
2019-07-24 19:31 ` Rob Herring
2019-10-16 1:25 Stephen Rothwell
2019-11-12 2:57 Stephen Rothwell
2020-10-15 3:21 Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2024-04-16 3:42 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinfvexAjfzrLtQXqqCLIqootCGhaVLmajLC8rtO@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).