From patchwork Mon Sep 26 09:05:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 116391 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 77A1DB6F68 for ; Mon, 26 Sep 2011 19:06:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752330Ab1IZJGC (ORCPT ); Mon, 26 Sep 2011 05:06:02 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:51146 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233Ab1IZJGA (ORCPT ); Mon, 26 Sep 2011 05:06:00 -0400 Received: from joe.akashicho.tokyo.vergenet.net (219-109-213-121.bitcat.net [219.109.213.121]) by kirsty.vergenet.net (Postfix) with ESMTP id BB93124EE23; Mon, 26 Sep 2011 19:05:58 +1000 (EST) Received: by joe.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 1D1D328A031; Mon, 26 Sep 2011 18:05:55 +0900 (JST) From: Simon Horman To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org Cc: Wensong Zhang , Julian Anastasov , Patrick McHardy , Pablo Neira Ayuso , "David S. Miller" Subject: [GIT PULL net-next] IPVS Date: Mon, 26 Sep 2011 18:05:33 +0900 Message-Id: <1317027938-22053-1-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, with all the excitement of kernel.org being offline and a bunch of trees likewise being offline I am a little unsure who should take this pull request which is based on the current net-next tree. But I guess it should be Patrick, Pablo or Dave. The following changes since commit 7777de9af54a1402c79bf7663b38ff5ba308dd45: qlcnic: Change CDRP function (2011-09-23 14:23:59 -0400) are available in the git repository at: git://github.com/horms/ipvs-next.git master Krzysztof Wilczynski (1): ipvs: Expose ip_vs_ftp module parameters via sysfs. Simon Horman (4): IPVS: Add documentation for new sysctl entries IPVS: Remove unused parameter from ip_vs_confirm_conntrack() IPVS: Remove unused return value of protocol state transitions IPVS: Removed unused variables Documentation/networking/ipvs-sysctl.txt | 52 +++++++++++++++++++++++++++++- include/net/ip_vs.h | 11 +++--- net/netfilter/ipvs/ip_vs_core.c | 13 +++---- net/netfilter/ipvs/ip_vs_ctl.c | 4 -- net/netfilter/ipvs/ip_vs_ftp.c | 5 ++- net/netfilter/ipvs/ip_vs_nfct.c | 2 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 14 ++------ net/netfilter/ipvs/ip_vs_proto_tcp.c | 6 +-- net/netfilter/ipvs/ip_vs_proto_udp.c | 5 +-- net/netfilter/ipvs/ip_vs_xmit.c | 2 +- 10 files changed, 75 insertions(+), 39 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html