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,
Nitin Gupta <ngupta@vflare.org>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging tree
Date: Mon, 13 Feb 2012 17:00:42 +0800 [thread overview]
Message-ID: <1329123642.2647.42.camel@cr0> (raw)
In-Reply-To: <20120213162008.a9a3092bec076bcf0f05c261@canb.auug.org.au>
On Mon, 2012-02-13 at 16:20 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/zram/zram_drv.c between commit fd1a30dea194 ("staging:
> zram: replace xvmalloc with zsmalloc") from the staging tree and commit
> ea81cfe7d7fb ("zram: 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!
next prev parent reply other threads:[~2012-02-13 9:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 5:20 linux-next: manual merge of the kmap_atomic tree with the staging tree Stephen Rothwell
2012-02-13 9:00 ` Cong Wang [this message]
[not found] <20120301170731.e14fb63e606a8e67b0cb919a@canb.auug.org.au>
2012-03-02 5:51 ` Cong Wang
-- strict thread matches above, loose matches on Subject: below --
2012-02-13 5:27 Stephen Rothwell
2012-02-13 9:00 ` Cong Wang
2012-02-13 5:15 Stephen Rothwell
2012-02-13 9:01 ` Cong Wang
2012-02-13 5:08 Stephen Rothwell
2012-02-13 9:02 ` Cong Wang
2012-01-06 7:40 Stephen Rothwell
2012-01-06 8:17 ` Cong Wang
2012-01-06 15:47 ` Haiyang Zhang
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=1329123642.2647.42.camel@cr0 \
--to=amwang@redhat.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ngupta@vflare.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.