From: Patrick McHardy <kaber@trash.net>
To: Simon Horman <horms@verge.net.au>
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org,
Hans Schillstrom <hans@schillstrom.com>,
Julian Anastasov <ja@ssi.bg>
Subject: Re: [GIT PULL nf-next-2.6] IPVS
Date: Mon, 14 Mar 2011 19:17:34 +0100 [thread overview]
Message-ID: <4D7E5BBE.7060702@trash.net> (raw)
In-Reply-To: <1300056261-14709-1-git-send-email-horms@verge.net.au>
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!
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
next prev parent reply other threads:[~2011-03-14 18:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-13 22:44 [GIT PULL nf-next-2.6] IPVS Simon Horman
2011-03-13 22:44 ` [PATCH 1/4] ipvs: avoid lookup for fwmark 0 Simon Horman
2011-03-13 22:44 ` [PATCH 2/4] ipvs: remove _bh from percpu stats reading Simon Horman
2011-03-13 22:44 ` [PATCH 3/4] netfilter:ipvs: use kmemdup Simon Horman
2011-03-13 22:44 ` [PATCH 4/4] Fix variable assignment in ip_vs_notrack Simon Horman
2011-03-14 18:17 ` Patrick McHardy [this message]
2011-03-14 23:13 ` [GIT PULL nf-next-2.6] IPVS Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2011-04-05 3:22 Simon Horman
2011-04-05 10:18 ` Patrick McHardy
2011-03-15 5:27 Simon Horman
2011-03-15 12:16 ` Patrick McHardy
2011-03-14 9:06 Simon Horman
2011-02-25 2:43 Simon Horman
2011-02-27 15:25 ` Patrick McHardy
2011-02-16 6:04 Simon Horman
2011-02-16 13:19 ` Patrick McHardy
2011-02-07 9:19 Simon Horman
2011-02-09 7:06 ` Patrick McHardy
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=4D7E5BBE.7060702@trash.net \
--to=kaber@trash.net \
--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=netfilter@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.