linux-next: manual merge of the kmap_atomic tree with the ecryptfs tree
From: Stephen Rothwell <hidden>
Date: 2012-01-25 02:32:14
Also in:
lkml
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 836 bytes