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

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] [day] [month] [year] [list]

Message-ID: <20110307161938.GC9088@kroah.com>
Date:	Mon, 7 Mar 2011 08:19:38 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Steve Sakoman <steve@...oman.com>,
	Tomi Valkeinen <tomi.valkeinen@...com>,
	Keshava Munegowda <keshava_mgowda@...com>,
	Felipe Balbi <balbi@...com>
Subject: Re: linux-next: manual merge of the usb tree with the omap_dss2
 tree

On Mon, Mar 07, 2011 at 04:54:18PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-omap2/board-overo.c between commit fd045fe21361 ("OMAP:
> DSS2: Add DSS2 support for Overo") from the omap_dss2 tree and commits
> 181b250cf532 ("arm: omap: usb: create common enums and structures for
> ehci and ohci") and 9e64bb1e9f06 ("arm: omap: usb: Invoke usbhs core
> device initialization") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks.  Felipe, am I going to have problems merging with Linus when the
.39 merge window opens up because of these omap changes in my tree?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/