linux-kernel - linux-next: manual merge of the kmap_atomic tree with the ecryptfs 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: <20120125133201.faa14529e7f872d38a714fb5@canb.auug.org.au>
Date:	Wed, 25 Jan 2012 13:32:01 +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,
	Tyler Hicks <tyhicks@...onical.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the ecryptfs
 tree

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
fs/ecryptfs/read_write.c between commit f28b7904d455 ("eCryptfs: Remove
unused ecryptfs_read()") from the ecryptfs tree and commit 27de090e3326
("ecryptfs: remove the second argument of k[un]map_atomic()") from the
kmap_atomic tree.

The former just removed the entire ecryptfs_read() function that was
modified as part of the latter, so I did that.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped