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,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Bruce Allan <bruce.w.allan@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the tree
Date: Wed, 08 Feb 2012 17:30:18 +0800 [thread overview]
Message-ID: <1328693418.2442.18.camel@cr0> (raw)
In-Reply-To: <20120208151057.5ad413a05fbbb393b4a00109@canb.auug.org.au>
On Wed, 2012-02-08 at 15:10 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/net/ethernet/intel/e1000e/netdev.c between commit 0e15df490eef
> ("e1000e: minor whitespace and indentation cleanup") from the net-next
> tree and commit 2b4ba510a572 ("net: 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.
Hi, Stephen,
Looks good, thanks!
prev parent reply other threads:[~2012-02-08 9:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-08 4:10 linux-next: manual merge of the kmap_atomic tree with the tree Stephen Rothwell
2012-02-08 9:30 ` 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=1328693418.2442.18.camel@cr0 \
--to=amwang@redhat.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@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).