Re: [GIT PULL nf-next] IPVS for 3.7 #2

[Simon Horman <horms@verge.net.au>]

On Tue, Oct 09, 2012 at 01:17:04AM +0200, Pablo Neira Ayuso wrote:
> 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.

I understand.

> 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.

There is a fix from Arnd that I would like incorporated in 3.7.
I will send a pull-request for that a little later.

> 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(-)
> > 
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>