Message-ID: <1329123676.2647.43.camel@cr0>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the
 staging tree
From: Cong Wang <amwang@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Seth Jennings <sjenning@linux.vnet.ibm.com>,
        Dan Magenheimer <dan.magenheimer@oracle.com>, Greg KH <greg@kroah.com>
Date: Mon, 13 Feb 2012 17:01:16 +0800
In-Reply-To: <20120213161537.3cf109d3f9c4c577f8fcb789@canb.auug.org.au>
References: <20120213161537.3cf109d3f9c4c577f8fcb789@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 754
Lines: 20

On Mon, 2012-02-13 at 16:15 +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 a49aeb1de585
> ("staging: zcache: replace xvmalloc with zsmalloc") (and mayb others)
> from the staging tree and commit 1edbcaee3bbe ("zcache: remove the second
> argument of k [un]map_atomic()") from the kmap_atomic tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good.

Thanks!

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