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>,
Greg KH <greg@kroah.com>,
akpm@linux-foundation.org
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
Date: Thu, 09 Feb 2012 16:39:57 +0800 [thread overview]
Message-ID: <1328776797.20628.18.camel@cr0> (raw)
In-Reply-To: <20120209144807.78f2807f594959f3836cf2eb@canb.auug.org.au>
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.
next prev parent reply other threads:[~2012-02-09 8:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 3:48 linux-next: manual merge of the kmap_atomic tree with the staging.current tree Stephen Rothwell
2012-02-09 8:39 ` Cong Wang [this message]
2012-02-09 8:45 ` Andrew Morton
2012-02-09 9:26 ` Cong Wang
-- strict thread matches above, loose matches on Subject: below --
2012-01-31 3:27 Stephen Rothwell
2012-01-31 3:39 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328776797.20628.18.camel@cr0 \
--to=amwang@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sjenning@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox