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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 5 Oct 2011 11:52:39 +0300
From:	Felipe Balbi <balbi@...com>
To:	Greg KH <greg@...ah.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Felipe Balbi <balbi@...com>, Tony Lindgren <tony@...mide.com>
Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (491 bytes)