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

Message-Id: <20120210154753.54d5620ba268f2d1e8717838@canb.auug.org.au>
Date:	Fri, 10 Feb 2012 15:47:53 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Seth Jennings <sjenning@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the staging tree with Linus' tree

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).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped