Messages in this thread |  | | Subject | Re: linux-next: manual merge of the kmap_atomic tree with the ecryptfs tree | | From | Cong Wang <> | | Date | Wed, 25 Jan 2012 20:35:21 +0800 |
| |
On Wed, 2012-01-25 at 13:32 +1100, Stephen Rothwell wrote: > 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. >
Hi, Stephen,
Sounds good to me! Thank you!
|  |