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
| ||
|
Date: Fri, 4 May 2012 16:18:42 -0700 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, Alan Stern <stern@...land.harvard.edu>, Stephen Warren <swarren@...dotorg.org>, Venu Byravarasu <vbyravarasu@...dia.com> Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree On Thu, May 03, 2012 at 02:44:10PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update > PM methods in ehci-tegra.c") from the usb.current tree and commit > fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thanks, that looks correct, I'll resolve the merge in my tree when -rc6 comes out. 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/
Powered by blists - more mailing lists