From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: [GIT PULL next-2.6] IPVS Date: Mon, 13 Jun 2011 17:26:06 +0900 Message-ID: <1307953569-15429-1-git-send-email-horms@verge.net.au> Cc: Wensong Zhang , Julian Anastasov , Patrick McHardy , Pablo Neira Ayuso To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org Return-path: Sender: netfilter-owner@vger.kernel.org List-Id: netfilter-devel.vger.kernel.org Hi Patrick, Hi Pablo, please consider pulling git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6.git master It includes two clean-ups by Hans and an enhancement of the FTP helper by Julian. I have based the pull request on next-2.6 as nf-next-2.6 seems to be a little old. Please let me know if a different base would suit you better. Hans Schillstrom (2): IPVS remove unused var from migration to netns IPVS: rename of netns init and cleanup functions. Julian Anastasov (1): ipvs: support more FTP PASV responses include/net/ip_vs.h | 28 +++++++++----------- net/netfilter/ipvs/ip_vs_app.c | 4 +- net/netfilter/ipvs/ip_vs_conn.c | 4 +- net/netfilter/ipvs/ip_vs_core.c | 36 +++++++++++++------------- net/netfilter/ipvs/ip_vs_ctl.c | 20 +++++++------- net/netfilter/ipvs/ip_vs_est.c | 4 +- net/netfilter/ipvs/ip_vs_ftp.c | 52 +++++++++++++++++++++++++++---------- net/netfilter/ipvs/ip_vs_proto.c | 4 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- 9 files changed, 89 insertions(+), 67 deletions(-)