Re: linux-next: manual merge of the usb tree with the arm-soc tree

From: Felipe Balbi
Date: Wed Oct 05 2011 - 04:52:46 EST

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...


Attachment: signature.asc
Description: Digital signature