linux-kernel - linux-next: manual merge of the kmap

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: <20120213162752.b4207f13fb95d7e4db1b5ba2@canb.auug.org.au>
Date:	Mon, 13 Feb 2012 16:27:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Cong Wang <amwang@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nitin Gupta <ngupta@...are.org>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the staging
 tree

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/zram/xvmalloc.c between commit b154ff05e1b0 ("staging:
zram: remove xvmalloc") from the staging tree and commit ea81cfe7d7fb
("zram: remove the second argument of k[un]map_atomic()") from the
kmap_atomic tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped