From: Patrick McHardy <kaber@trash.net>
To: Simon Horman <horms@verge.net.au>
Cc: lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org,
netdev@vger.kernel.org, Changli Gao <xiaosuo@gmail.com>,
Julian Anastasov <ja@ssi.bg>
Subject: Re: [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3
Date: Wed, 26 Jan 2011 16:27:58 +0100 [thread overview]
Message-ID: <4D403D7E.2050902@trash.net> (raw)
In-Reply-To: <20110125235744.GA11026@verge.net.au>
On 26.01.2011 00:57, Simon Horman wrote:
> On Tue, Jan 25, 2011 at 03:01:35PM +0100, Patrick McHardy wrote:
>> On 25.01.2011 14:17, Simon Horman wrote:
>>> Hi Patrick,
>>>
>>> please consider pulling
>>> git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick
>>>
>>> Which includes the following changes, both of which I believe 2.6.38 material.
>>>
>>> Changli Gao (1):
>>> netfilter: ipvs: fix compiler warnings
>>>
>>> Hans Schillstrom (1):
>>> IPVS netns BUG, register sysctl for root ns
>>
>> That tree is based on nf-next-2.6, so I can't pull this into my nf-2.6
>> tree.
>
> Hi Patrick,
>
> Sorry about this.
>
> As it turns out I was mistaken in assuming that the IPVS netns changes
> had been merged into nf-2.6. They haven't, they only exist in net-next-2.6.
>
> All of the recent patches that I have passed on to you relate to the IPVS
> netns changes so nf-next-2.6 is the right place for these fixes. So could
> you please pull the above tree into nf-next-2.6? I do not believe there are
> any nf-2.6 changes at this time.
Thanks, I've pulled it into nf-next-2.6.git.
prev parent reply other threads:[~2011-01-26 15:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-25 13:17 [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3 Simon Horman
2011-01-25 13:17 ` [PATCH 1/2] IPVS netns BUG, register sysctl for root ns Simon Horman
2011-01-25 13:17 ` [PATCH 2/2] netfilter: ipvs: fix compiler warnings Simon Horman
2011-01-25 14:01 ` [GIT PULL nf-next-2.6] IPVS changes for 2.6.38-rc3 Patrick McHardy
2011-01-25 23:57 ` Simon Horman
2011-01-26 15:27 ` Patrick McHardy [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=4D403D7E.2050902@trash.net \
--to=kaber@trash.net \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=xiaosuo@gmail.com \
/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).