From: Felipe Balbi <balbi@ti.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felipe Balbi <balbi@ti.com>, Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree
Date: Wed, 5 Oct 2011 11:52:39 +0300 [thread overview]
Message-ID: <20111005085237.GB24472@legolas.emea.dhcp.ti.com> (raw)
In-Reply-To: <20111004152611.GC29994@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
On Tue, Oct 04, 2011 at 08:26:11AM -0700, Greg KH wrote:
> On Tue, Oct 04, 2011 at 04:50:30PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > arch/arm/mach-omap2/Makefile between commit f41caddbe73f ("omap2+: Use
> > Kconfig symbol in Makefile instead of obj-y") from the arm-soc tree and
> > commitb 3c3dc22366b ("usb: musb: fix build breakage") from the usb tree.
> >
> > I fixed it up (I think, see below) and can carry the fix as necessary.
>
> Ick, what a mess. Tony and Felipe, is what is below correct?
looks ok, but I don't see omap_phy_internal.o being added anywhere.
Maybe this hunk doesn't show...
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-10-05 8:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 5:50 linux-next: manual merge of the usb tree with the arm-soc tree Stephen Rothwell
2011-10-04 15:26 ` Greg KH
2011-10-05 8:52 ` Felipe Balbi [this message]
2011-10-05 10:51 ` Stephen Rothwell
2011-10-05 10:53 ` Felipe Balbi
2014-03-03 7:13 Stephen Rothwell
2014-03-03 7:13 ` Stephen Rothwell
2014-03-03 7:13 ` Stephen Rothwell
2014-07-24 6:28 Stephen Rothwell
2014-07-24 6:28 ` Stephen Rothwell
2014-07-24 6:28 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:42 ` Greg KH
2014-07-24 6:42 ` Greg KH
2014-07-24 15:39 ` Olof Johansson
2014-07-24 15:39 ` Olof Johansson
2014-07-24 15:39 ` Olof Johansson
2021-06-17 4:43 Stephen Rothwell
2021-06-17 4:43 ` Stephen Rothwell
2021-06-17 16:34 ` Matthias Kaehlcke
2021-06-17 16:34 ` Matthias Kaehlcke
2021-06-17 17:30 ` Bjorn Andersson
2021-06-17 17:30 ` Bjorn Andersson
2021-06-18 6:35 ` Greg KH
2021-06-18 6:35 ` Greg KH
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=20111005085237.GB24472@legolas.emea.dhcp.ti.com \
--to=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 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.