From: Simon Horman <horms@verge.net.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, lvs-devel@vger.kernel.org,
netdev@vger.kernel.org, Patrick McHardy <kaber@trash.net>,
Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans.schillstrom@ericsson.com>
Subject: Re: [GIT PULL nf-next-2.6] ipvs namespaces
Date: Thu, 13 Jan 2011 10:57:09 +0900 [thread overview]
Message-ID: <20110113015707.GA7082@verge.net.au> (raw)
In-Reply-To: <4D2E0F32.8020602@netfilter.org>
On Wed, Jan 12, 2011 at 09:29:38PM +0100, Pablo Neira Ayuso wrote:
> Hi Simon,
>
> On 06/01/11 07:15, Simon Horman wrote:
> > Hi Patrick,
> >
> > please consider pulling
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master
> > in order to get the netns changes to IPVS from Hans Schillstrom.
>
> I'm hitting some conflicts when pulling from your tree.
>
> >From git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6
> * branch master -> FETCH_HEAD
> Auto-merging include/linux/netfilter.h
> Auto-merging include/linux/skbuff.h
> Auto-merging include/net/netfilter/nf_conntrack.h
> Auto-merging net/core/skbuff.c
> Auto-merging net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
> Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c
> Auto-merging net/netfilter/core.c
> Auto-merging net/netfilter/ipvs/ip_vs_ctl.c
> CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c
Hi Pablo,
I've sent a fresh series "[PATCH 00/22] ipvs namespaces v3.3" that should
resolve the conficts (I think). More details in the cover email for that
series.
prev parent reply other threads:[~2011-01-13 1:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 6:15 [GIT PULL nf-next-2.6] ipvs namespaces Simon Horman
2011-01-06 6:15 ` [PATCH 01/22] IPVS: netns, add basic init per netns Simon Horman
2011-01-06 6:15 ` [PATCH 02/22] IPVS: netns to services part 1 Simon Horman
2011-01-06 6:15 ` [PATCH 03/22] IPVS: netns awarness to lblcr sheduler Simon Horman
2011-01-06 6:16 ` [PATCH 04/22] IPVS: netns awarness to lblc sheduler Simon Horman
2011-01-06 6:16 ` [PATCH 05/22] IPVS: netns, prepare protocol Simon Horman
2011-01-06 6:16 ` [PATCH 06/22] IPVS: netns preparation for proto_tcp Simon Horman
2011-01-06 6:16 ` [PATCH 07/22] IPVS: netns preparation for proto_udp Simon Horman
2011-01-06 6:16 ` [PATCH 08/22] IPVS: netns preparation for proto_sctp Simon Horman
2011-01-06 6:16 ` [PATCH 09/22] IPVS: netns preparation for proto_ah_esp Simon Horman
2011-01-06 6:16 ` [PATCH 10/22] IPVS: netns, use ip_vs_proto_data as param Simon Horman
2011-01-06 6:16 ` [PATCH 11/22] IPVS: netns, common protocol changes and use of appcnt Simon Horman
2011-01-06 6:16 ` [PATCH 12/22] IPVS: netns awareness to ip_vs_app Simon Horman
2011-01-06 6:16 ` [PATCH 13/22] IPVS: netns awareness to ip_vs_est Simon Horman
2011-01-06 6:16 ` [PATCH 14/22] IPVS: netns awareness to ip_vs_sync Simon Horman
2011-01-06 6:16 ` [PATCH 15/22] IPVS: netns, ip_vs_stats and its procfs Simon Horman
2011-01-06 6:16 ` [PATCH 16/22] IPVS: netns, connection hash got net as param Simon Horman
2011-01-06 6:16 ` [PATCH 17/22] IPVS: netns, ip_vs_ctl local vars moved to ipvs struct Simon Horman
2011-01-06 6:16 ` [PATCH 18/22] IPVS: netns, defense work timer Simon Horman
2011-01-06 6:16 ` [PATCH 19/22] IPVS: netns, trash handling Simon Horman
2011-01-06 6:16 ` [PATCH 20/22] IPVS: netns, svc counters moved in ip_vs_ctl,c Simon Horman
2011-01-06 6:16 ` [PATCH 21/22] IPVS: netns, misc init_net removal in core Simon Horman
2011-01-06 6:16 ` [PATCH 22/22] IPVS: netns, final patch enabling network name space Simon Horman
2011-01-11 6:21 ` [GIT PULL nf-next-2.6] ipvs namespaces Simon Horman
2011-01-11 22:34 ` David Miller
2011-01-11 23:01 ` Simon Horman
2011-01-12 0:15 ` Pablo Neira Ayuso
2011-01-12 0:20 ` Simon Horman
2011-01-12 20:29 ` Pablo Neira Ayuso
2011-01-13 1:57 ` Simon Horman [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=20110113015707.GA7082@verge.net.au \
--to=horms@verge.net.au \
--cc=hans.schillstrom@ericsson.com \
--cc=ja@ssi.bg \
--cc=kaber@trash.net \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/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).