From: Cong Wang <xiyou.wangcong@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sasha Levin <sasha.levin@oracle.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the akpm tree with the net-next tree
Date: Wed, 20 Feb 2013 14:43:02 +0800 [thread overview]
Message-ID: <51247076.5000003@gmail.com> (raw)
In-Reply-To: <20130220170223.806c3c5e9f240d8bacc7c940@canb.auug.org.au>
On 02/20/2013 02:02 PM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> net/core/dev.c between commit 900ff8c63214 ("net: move procfs code to
> net/core/net-procfs.c") from the net-next tree and commit "hlist: drop
> the node parameter from iterators" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks good.
Thanks, Stephen!
next prev parent reply other threads:[~2013-02-20 6:43 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 6:02 linux-next: manual merge of the akpm tree with the net-next tree Stephen Rothwell
2013-02-20 6:02 ` Stephen Rothwell
2013-02-20 6:43 ` Cong Wang [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 9:30 Stephen Rothwell
2020-06-02 9:45 ` Stephen Rothwell
2019-07-03 10:49 Stephen Rothwell
2018-01-16 4:51 Stephen Rothwell
2017-03-20 5:10 Stephen Rothwell
2017-02-07 5:23 Stephen Rothwell
2017-02-07 8:40 ` Marc Kleine-Budde
2017-02-07 9:45 ` Stephen Rothwell
2015-05-14 7:39 Stephen Rothwell
2015-05-14 7:39 ` Stephen Rothwell
2015-05-14 7:38 Stephen Rothwell
2015-05-14 7:38 ` Stephen Rothwell
2014-07-23 8:18 Stephen Rothwell
2014-07-23 8:18 ` Stephen Rothwell
2013-11-06 9:00 Stephen Rothwell
2013-11-06 9:00 ` Stephen Rothwell
2013-11-06 8:55 Stephen Rothwell
2013-11-06 8:55 ` Stephen Rothwell
2013-05-21 4:32 Stephen Rothwell
2013-05-21 4:32 ` Stephen Rothwell
2013-05-21 4:29 Stephen Rothwell
2013-05-21 4:29 ` Stephen Rothwell
2013-05-21 20:04 ` Andrew Morton
2013-05-21 20:04 ` Andrew Morton
2013-05-22 7:07 ` David Miller
2013-05-22 7:14 ` Andrew Morton
2013-05-22 7:19 ` David Miller
2013-05-22 7:48 ` Daniel Borkmann
2013-05-21 4:25 Stephen Rothwell
2013-05-21 4:25 ` Stephen Rothwell
2013-05-21 7:44 ` Daniel Borkmann
2013-05-21 23:54 ` Stephen Rothwell
2013-05-22 9:20 ` Daniel Borkmann
2013-05-20 4:14 Stephen Rothwell
2013-05-20 4:14 ` Stephen Rothwell
2013-05-20 4:11 Stephen Rothwell
2013-05-20 4:11 ` Stephen Rothwell
2013-02-15 6:56 Stephen Rothwell
2013-02-15 6:56 ` Stephen Rothwell
2012-06-08 3:56 Stephen Rothwell
2012-06-08 3:56 ` Stephen Rothwell
2011-11-23 3:27 Stephen Rothwell
2011-11-23 3:27 ` Stephen Rothwell
2011-11-23 3:40 ` Neil Horman
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=51247076.5000003@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sasha.levin@oracle.com \
--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.