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, 9 Feb 2012 21:30:13 -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, Seth Jennings <sjenning@...ux.vnet.ibm.com> Subject: Re: linux-next: manual merge of the staging tree with Linus' tree On Fri, Feb 10, 2012 at 03:47:53PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/zcache/zcache-main.c between commit 2a4830110b90 > ("staging: zcache: fix serialization bug in zv stats") from Linus' tree > (and also in the staging tree) and commit a49aeb1de585 ("staging: zcache: > replace xvmalloc with zsmalloc") from the staging tree. > > I used the staging tree version (since these were just further changes to > the same bits of code). Thanks, that sounds correct. 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