From patchwork Tue Oct 15 02:01:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 283439 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 645012C032E for ; Tue, 15 Oct 2013 13:03:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932139Ab3JOCCk (ORCPT ); Mon, 14 Oct 2013 22:02:40 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:44806 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756961Ab3JOCCL (ORCPT ); Mon, 14 Oct 2013 22:02:11 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (p3094-ipbfp1203kobeminato.hyogo.ocn.ne.jp [118.10.152.94]) by kirsty.vergenet.net (Postfix) with ESMTP id 30E3225BE76; Tue, 15 Oct 2013 13:02:10 +1100 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 22D7C6CE045; Tue, 15 Oct 2013 11:02:01 +0900 (JST) From: Simon Horman To: Pablo Neira Ayuso Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Wensong Zhang , Julian Anastasov , Simon Horman Subject: [GIT PULL] IPVS updates for v3.13 Date: Tue, 15 Oct 2013 11:01:44 +0900 Message-Id: <1381802507-7934-1-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.8.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Pablo, please consider the following fixes for IPVS for v3.13. This pull request is based on nf-next. The following changes since commit 58308451e91974267e1f4a618346055342019e02: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2013-10-10 15:29:44 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.13 for you to fetch changes up to 1255ce5f10dbb4646c8d43b8d59faab48ae4a6b2: ipvs: improved SH fallback strategy (2013-10-15 10:54:50 +0900) ---------------------------------------------------------------- IPVS updates for v3.13 * Improvements to SH fallback strategy * Avoid rcu_barrier during netns cleanup * Fix the IPVS_CMD_ATTR_MAX definition ---------------------------------------------------------------- Alexander Frolkin (1): ipvs: improved SH fallback strategy Julian Anastasov (2): ipvs: fix the IPVS_CMD_ATTR_MAX definition ipvs: avoid rcu_barrier during netns cleanup include/net/ip_vs.h | 6 ++++++ include/uapi/linux/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +----- net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- net/netfilter/ipvs/ip_vs_sh.c | 39 +++++++++++++++++++++++++++++---------- 6 files changed, 39 insertions(+), 18 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