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: Thu, 2 Sep 2010 20:27:18 -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, Michal Simek <michal.simek@...alogix.com>, Jason Wessel <jason.wessel@...driver.com> Subject: Re: linux-next: manual merge of the tty tree with the microblaze tree On Fri, Sep 03, 2010 at 01:02:36PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/serial/uartlite.c between commit > 52ea4a7ef12f286bd68d13a93daaa688f56a1e14 ("serial: Add CONSOLE_POLL > support for uartlite") from the microblaze tree and commit > 0e5176373d9c9a7741b54ce81a9eea342291bdca ("serial: Add CONSOLE_POLL > support for uartlite") from the tty tree. > > The same, but slightly different patch. I used the version from the tty > tree. Yes please, that's the version that works :) Can someone drop it from the microblaze tree please? 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/
Powered by blists - more mailing lists