lkml.org 
[lkml]   [2012]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-01-25 03:35    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog