linux-kernel - Re: linux-next: manual merge of the usb tree with the arm 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] [day] [month] [year] [list]

Date:	Mon, 3 Jan 2011 21:29:18 -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,
	Mac Lin <mkl0301@...il.com>,
	Anton Vorontsov <cbouatmailru@...il.com>,
	Russell King <rmk@....linux.org.uk>,
	Deepak Sikri <deepak.sikri@...com>,
	Viresh Kumar <viresh.kumar@...com>,
	Pavankumar Kondeti <pkondeti@...eaurora.org>
Subject: Re: linux-next: manual merge of the usb tree with the arm tree

On Tue, Jan 04, 2011 at 03:55:13PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/Kconfig between commit
> 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
> OHCI bus glue for cns3xxx SOCs") from the arm tree and commits
> c8c38de9d8002578599222296b90696745ac0fe3 ("USB host: Adding USB ehci &
> ohci support for spear platform") and
> b0848aea10da186372582f33152efdda43944f26 ("USB: EHCI: Add MSM Host
> Controller driver") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, that looks fine.

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/