Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree

From: Cong Wang <[email-masked]>
Date: Thu, 09 Feb 2012 16:39:57 +0800

On Thu, 2012-02-09 at 14:48 +1100, Stephen Rothwell wrote:
> Hi Cong,
> 
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
> ("staging: zcache: fix serialization bug in zv stats") from the
> staging.current tree and commit a3a2486aeadb ("zcache: remove the second
> argument of k [un]map_atomic()") from the kmap_atomic tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good. Thanks, Stephen!

Andrew, Greg,

As Linus doesn't want to merge my tree, could any of you take my patches
in kmap_atomic tree?

Thanks.