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,
NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the md tree
Date: Thu, 15 Mar 2012 16:47:13 +0800 [thread overview]
Message-ID: <1331801233.30489.7.camel@cr0> (raw)
In-Reply-To: <20120315170943.378ed2719af547d5b4419e6f@canb.auug.org.au>
On Thu, 2012-03-15 at 17:09 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/md/bitmap.c between commit 83a191d7b09d ("md/bitmap: remove some
> pointless locking") from the md tree and commit 63716d51774d ("md: 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.
Ok, looks good to me.
Thanks!
prev parent reply other threads:[~2012-03-15 8:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 6:09 linux-next: manual merge of the kmap_atomic tree with the md tree Stephen Rothwell
2012-03-15 8:47 ` Cong Wang [this message]
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=1331801233.30489.7.camel@cr0 \
--to=amwang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox