From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: David Miller <davem@davemloft.net>,
Simon Horman <horms@verge.net.au>,
lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org,
Wensong Zhang <wensong@linux-vs.org>,
Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans.schillstrom@ericsson.com>,
Hans Schillstrom <hans@schillstrom.com>
Subject: Re: [GIT PULL nf-next] IPVS for 3.7 #2
Date: Tue, 9 Oct 2012 01:17:04 +0200 [thread overview]
Message-ID: <20121008231704.GA7974@1984> (raw)
In-Reply-To: <1349721865.22194.53.camel@localhost>
Hi Jesper,
On Mon, Oct 08, 2012 at 08:44:25PM +0200, Jesper Dangaard Brouer wrote:
> Hey Pablo,
>
> These changes were intended for 3.7, but just checked you git tree...
> and it looks like you didn't pull in Simon's changes, and thus they have
> not hit DaveM's tree for the merge window :-(
Sorry, you sent this pull request by friday 28/09. Net-next was closed
on tuesday 02/10. That was tight. I don't like to push things too hard
to David by last time.
My intention is still to pass this to net-next once it gets opened
again, of course. So don't worry, we still have the chance to get this
in.
I see at least one fix in this patchset, we can still pass it that to
3.7 if you want.
Let me know what you prefer.
> --Jesper
>
>
> On Fri, 2012-09-28 at 11:54 +0900, Simon Horman wrote:
> > Hi Pablo,
> >
> > please consider the following enhancements to IPVS for inclusion in 3.7.
> >
> > ----------------------------------------------------------------
> > The following changes since commit 82c93fcc2e1737fede2752520f1bf8f4de6304d8:
> >
> > x86: bpf_jit_comp: add XOR instruction for BPF JIT (2012-09-24 16:54:35 -0400)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master
> >
> > for you to fetch changes up to 92eec78d25aee6bbc9bd295f51c022ddfa80cdd9:
> >
> > ipvs: SIP fragment handling (2012-09-28 11:37:16 +0900)
> >
> > ----------------------------------------------------------------
> > Jesper Dangaard Brouer (7):
> > ipvs: Trivial changes, use compressed IPv6 address in output
> > ipvs: IPv6 extend ICMPv6 handling for future types
> > ipvs: Use config macro IS_ENABLED()
> > ipvs: Fix faulty IPv6 extension header handling in IPVS
> > ipvs: Complete IPv6 fragment handling for IPVS
> > ipvs: API change to avoid rescan of IPv6 exthdr
> > ipvs: SIP fragment handling
> >
> > include/net/ip_vs.h | 194 +++++++++++----
> > net/netfilter/ipvs/Kconfig | 7 +-
> > net/netfilter/ipvs/ip_vs_conn.c | 15 +-
> > net/netfilter/ipvs/ip_vs_core.c | 404 +++++++++++++++++--------------
> > net/netfilter/ipvs/ip_vs_dh.c | 2 +-
> > net/netfilter/ipvs/ip_vs_lblc.c | 2 +-
> > net/netfilter/ipvs/ip_vs_lblcr.c | 2 +-
> > net/netfilter/ipvs/ip_vs_pe_sip.c | 18 +-
> > net/netfilter/ipvs/ip_vs_proto.c | 6 +-
> > net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 9 +-
> > net/netfilter/ipvs/ip_vs_proto_sctp.c | 42 ++--
> > net/netfilter/ipvs/ip_vs_proto_tcp.c | 40 ++-
> > net/netfilter/ipvs/ip_vs_proto_udp.c | 41 ++--
> > net/netfilter/ipvs/ip_vs_sched.c | 2 +-
> > net/netfilter/ipvs/ip_vs_sh.c | 2 +-
> > net/netfilter/ipvs/ip_vs_xmit.c | 73 +++---
> > net/netfilter/xt_ipvs.c | 4 +-
> > 17 files changed, 501 insertions(+), 362 deletions(-)
>
>
next prev parent reply other threads:[~2012-10-08 23:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 2:54 [GIT PULL nf-next] IPVS for 3.7 #2 Simon Horman
2012-09-28 2:54 ` [PATCH 1/7] ipvs: Trivial changes, use compressed IPv6 address in output Simon Horman
2012-09-28 2:54 ` [PATCH 2/7] ipvs: IPv6 extend ICMPv6 handling for future types Simon Horman
2012-09-28 2:55 ` [PATCH 3/7] ipvs: Use config macro IS_ENABLED() Simon Horman
2012-09-28 2:55 ` [PATCH 4/7] ipvs: Fix faulty IPv6 extension header handling in IPVS Simon Horman
2012-09-28 2:55 ` [PATCH 5/7] ipvs: Complete IPv6 fragment handling for IPVS Simon Horman
2012-09-28 2:55 ` [PATCH 6/7] ipvs: API change to avoid rescan of IPv6 exthdr Simon Horman
2012-09-28 2:55 ` [PATCH 7/7] ipvs: SIP fragment handling Simon Horman
2012-10-08 18:44 ` [GIT PULL nf-next] IPVS for 3.7 #2 Jesper Dangaard Brouer
2012-10-08 23:17 ` Pablo Neira Ayuso [this message]
2012-10-09 3:52 ` Simon Horman
2012-10-22 10:55 ` Pablo Neira Ayuso
2012-10-22 11:53 ` Jesper Dangaard Brouer
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=20121008231704.GA7974@1984 \
--to=pablo@netfilter.org \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=hans.schillstrom@ericsson.com \
--cc=hans@schillstrom.com \
--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=wensong@linux-vs.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).