On Mon, Mar 14, 2011 at 07:17:34PM +0100, Patrick McHardy wrote:
> On 13.03.2011 23:44, Simon Horman wrote:
> > Hi Patrick,
> >
> > please consider pulling
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master
> > to get the following changes.
> >
> > Jesper Juhl (1):
> > Fix variable assignment in ip_vs_notrack
> >
> > Julian Anastasov (2):
> > ipvs: avoid lookup for fwmark 0
> > ipvs: remove _bh from percpu stats reading
> >
> > Shan Wei (1):
> > netfilter:ipvs: use kmemdup
> >
> > include/net/ip_vs.h | 2 +-
> > net/netfilter/ipvs/ip_vs_ctl.c | 8 +++++---
> > net/netfilter/ipvs/ip_vs_est.c | 8 ++++----
> > net/netfilter/ipvs/ip_vs_pe_sip.c | 9 ++++-----
> > net/netfilter/ipvs/ip_vs_sync.c | 3 +--
> > 5 files changed, 15 insertions(+), 15 deletions(-)
>
> The pull contained quite a lot of other changes. I'm undoing the
> pull for now, please resubmit the patches you actually want me to
> pull. Thanks!
Sorry about that. I will double check things but
the list below looks like the second request that I sent out
yesterday.
>
> Jesper Juhl (1):
> Fix variable assignment in ip_vs_notrack
>
> Julian Anastasov (8):
> ipvs: avoid lookup for fwmark 0
> ipvs: remove _bh from percpu stats reading
> ipvs: move struct netns_ipvs
> ipvs: reorganize tot_stats
> ipvs: properly zero stats and rates
> ipvs: remove unused seqcount stats
> ipvs: optimize rates reading
> ipvs: rename estimator functions
>
> Patrick McHardy (1):
> Merge branch 'master' of git://git.kernel.org/.../horms/lvs-test-2.6
>
> Shan Wei (1):
> netfilter:ipvs: use kmemdup
>
> Simon Horman (14):
> IPVS: Add ip_vs_route_me_harder()
> IPVS: Add sysctl_snat_reroute()
> IPVS: Add sysctl_nat_icmp_send()
> IPVS: Add {sysctl_sync_threshold,period}()
> IPVS: Add sysctl_sync_ver()
> IPVS: Add sysctl_expire_nodest_conn()
> IPVS: Add expire_quiescent_template()
> IPVS: Conditinally use sysctl_lblc{r}_expiration
> IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined
> IPVS: Conditional ip_vs_conntrack_enabled()
> IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined
> IPVS: Conditionally define and use ip_vs_lblc{r}_table
> IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()
> IPVS: Conditionally include sysctl members of struct netns_ipvs
>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
