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,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
Date: Tue, 31 Jan 2012 11:39:32 +0800 [thread overview]
Message-ID: <1327981172.10202.1.camel@cr0> (raw)
In-Reply-To: <20120131142747.a2dd139403833a50939dbd17@canb.auug.org.au>
On Tue, 2012-01-31 at 14:27 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/gma500/mmu.c between commit 344bc24c2947 ("staging:
> delete gma500 driver") from the staging.current tree and commit
> cb422c115787 ("gma500: remove the second argument of k[un]map_atomic()")
> from the kmap_atomic tree.
>
> The former removes this file (as the driver has migrated out of staging),
> so I did that.
>
Ok for me. Probably I need to remove that commit from my tree.
Thanks!
next prev parent reply other threads:[~2012-01-31 3:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 3:27 linux-next: manual merge of the kmap_atomic tree with the staging.current tree Stephen Rothwell
2012-01-31 3:39 ` Cong Wang [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-09 3:48 Stephen Rothwell
2012-02-09 8:39 ` Cong Wang
2012-02-09 8:45 ` Andrew Morton
2012-02-09 9:26 ` 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=1327981172.10202.1.camel@cr0 \
--to=amwang@redhat.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).