From: Greg KH <greg@kroah.com>
To: Felipe Balbi <balbi@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Anand Gadiyar <gadiyar@ti.com>, Tony Lindgren <tony@atomide.com>,
linux-omap@vger.kernel.org,
Keshava Munegowda <keshava_mgowda@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the omap tree
Date: Thu, 3 Mar 2011 08:02:09 -0800 [thread overview]
Message-ID: <20110303160209.GB13709@kroah.com> (raw)
In-Reply-To: <20110303084829.GB2644@legolas.emea.dhcp.ti.com>
On Thu, Mar 03, 2011 at 10:48:29AM +0200, Felipe Balbi wrote:
> On Wed, Mar 02, 2011 at 04:57:55PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 1dbea0f5e23b6c647db72fa4a048cb7140625e13 ("arm: omap4: 4430sdp: drop ehci
> > support") from the omap tree and commit
> > 181b250cf53233a7a7c6d7e1e9df402506712e93 ("arm: omap: usb: create common
> > enums and structures for ehci and ohci") from the usb tree.
> >
> > The former removed the code modified by the latter, so I did that.
>
> This can be fixed if Greg applies this patch:
>
> commit 076bfacd5bba0f2e419474488c8f8c060c7799d8
> Author: Anand Gadiyar <gadiyar@ti.com>
> Date: Wed Feb 16 16:47:19 2011 +0530
Care to provide it to me in a format that I can apply it? :)
thanks,
greg k-h
next prev parent reply other threads:[~2011-03-03 16:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-02 5:57 linux-next: manual merge of the usb tree with the omap tree Stephen Rothwell
2011-03-03 8:48 ` Felipe Balbi
2011-03-03 16:02 ` Greg KH [this message]
2011-03-03 17:39 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 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
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
2009-11-11 8:30 Stephen Rothwell
2009-11-11 19:12 ` Tony Lindgren
2009-11-11 19:20 ` Tony Lindgren
2009-11-11 21:52 ` 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=20110303160209.GB13709@kroah.com \
--to=greg@kroah.com \
--cc=balbi@ti.com \
--cc=gadiyar@ti.com \
--cc=keshava_mgowda@ti.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 \
--cc=tony@atomide.com \
/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