Re: linux-next: manual merge of the kmap_atomic tree with theecryptfs tree

[Cong Wang]

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!


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/