From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felipe Balbi <felipe.balbi@nokia.com>,
linux-omap@vger.kernel.org
Subject: Re: linux-next: manual merge of the usb tree with the omap tree
Date: Wed, 11 Nov 2009 11:12:13 -0800 [thread overview]
Message-ID: <20091111191213.GH24837@atomide.com> (raw)
In-Reply-To: <20091111193013.9a4bca3e.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [091111 00:29]:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit
> 7cb07f72711d3e10763ca7d7a9fcd7ac788aabf4 ("omap: ehci: Add platform init
> code") from the omap tree and commit
> 9e92239693d7010d2e710a445f46d6a738b09171 ("USB: host: ehci: introduce
> omap ehci-hcd driver") from the usb tree.
>
> Both commits create this file but I used the omap tree version because
> commit ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move
> remaining headers from include/mach to include/plat") from the omap tree
> moved one included header file (mach/usb.h -> plat/usb.h).
Oops, sorry. Looks like I accidentally included also drivers/usb/host/ehci-omap.c
as we were testing it in the linux-omap tree.
I'll drop the drivers/usb/host/ehci-omap.c part from my queue, it should get
integrated via Greg's queue. I'll just merge the platform init code.
Regards,
Tony
next prev parent reply other threads:[~2009-11-11 19:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-11 8:30 linux-next: manual merge of the usb tree with the omap tree Stephen Rothwell
2009-11-11 8:30 ` Stephen Rothwell
2009-11-11 19:12 ` Tony Lindgren [this message]
2009-11-11 19:20 ` Tony Lindgren
2009-11-11 21:52 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-12-23 6:18 Stephen Rothwell
2010-12-23 6:18 ` Stephen Rothwell
2010-12-23 8:36 ` Felipe Balbi
2010-12-23 18:29 ` Cousson, Benoit
2011-01-06 15:02 ` Ming Lei
2011-01-06 15:07 ` Anand Gadiyar
2011-01-06 15:25 ` Ming Lei
2011-01-06 15:50 ` Ming Lei
2011-01-07 14:07 ` Anand Gadiyar
2011-01-07 14:15 ` Ming Lei
2011-01-07 14:39 ` Anand Gadiyar
2011-01-07 15:20 ` Anand Gadiyar
2011-01-07 18:54 ` Gadiyar, Anand
2011-01-07 19:24 ` Felipe Balbi
2011-01-10 13:53 ` Ming Lei
2011-01-10 14:09 ` Anand Gadiyar
2011-01-06 15:43 ` Brad Parker
2011-01-06 16:59 ` Koen Kooi
2011-01-06 17:57 ` Nishanth Menon
2011-01-06 18:15 ` Kevin Hilman
2011-01-06 18:21 ` Nishanth Menon
2011-01-06 18:38 ` Kevin Hilman
2011-01-06 20:24 ` Nishanth Menon
2011-01-06 21:29 ` Kevin Hilman
2011-01-06 18:27 ` Paul Walmsley
2011-03-02 5:57 Stephen Rothwell
2011-03-02 5:57 ` Stephen Rothwell
2011-03-02 8:23 ` Felipe Balbi
2011-03-02 14:23 ` Greg KH
2011-03-03 8:18 ` Felipe Balbi
2011-03-02 5:57 Stephen Rothwell
2011-03-02 5:57 ` Stephen Rothwell
2011-03-03 8:48 ` Felipe Balbi
2011-03-03 16:02 ` Greg KH
2011-03-03 17:39 ` Felipe Balbi
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 ` Stephen Rothwell
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 ` 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=20091111191213.GH24837@atomide.com \
--to=tony@atomide.com \
--cc=felipe.balbi@nokia.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.