From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tony Lindgren <tony@atomide•com>
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: Thu, 12 Nov 2009 08:52:54 +1100 [thread overview]
Message-ID: <20091112085254.d856c4d0.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20091111192058.GI24837@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi Tony,
On Wed, 11 Nov 2009 11:20:59 -0800 Tony Lindgren <tony@atomide•com> wrote:
>
> * Tony Lindgren <tony@atomide•com> [091111 11:12]:
> >
> > 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.
>
> Dropped anything touching drivers/usb from my patch. So no need for Greg
> to do anything, the updated version of the patch below for reference.
OK, thanks. Just as long as we don't forget the necessary updates when
these are all integrated into Linus' tree. Some conflicts in linux-next
are not a bad thing for that reason.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-11-11 21:52 UTC|newest]
Thread overview: 38+ 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 19:12 ` Tony Lindgren
2009-11-11 19:20 ` Tony Lindgren
2009-11-11 21:52 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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 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-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
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=20091112085254.d856c4d0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=felipe.balbi@nokia$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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