From patchwork Tue Oct 23 00:50:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 193301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 09F582C0156 for ; Tue, 23 Oct 2012 11:51:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932351Ab2JWAu5 (ORCPT ); Mon, 22 Oct 2012 20:50:57 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:49421 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932227Ab2JWAu4 (ORCPT ); Mon, 22 Oct 2012 20:50:56 -0400 Received: from ayumi.akashicho.tokyo.vergenet.net (p6117-ipbfp1901kobeminato.hyogo.ocn.ne.jp [114.172.117.117]) by kirsty.vergenet.net (Postfix) with ESMTP id DE48725BF80; Tue, 23 Oct 2012 11:50:54 +1100 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 47778EDE55D; Tue, 23 Oct 2012 09:50:53 +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 , Hans Schillstrom , Hans Schillstrom , Jesper Dangaard Brouer , Fengguang Wu , Yuanhan Liu Subject: [GIT PULL nf-next] IPVS for 3.8 Date: Tue, 23 Oct 2012 09:50:50 +0900 Message-Id: <1350953451-19441-1-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Hi Pablo, please consider the following build fix from Jesper for 3.8. ---------------------------------------------------------------- The following changes since commit bcc58c4d9141160d6448e4589acbd46e5c647518: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next (2012-10-22 12:30:41 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git master for you to fetch changes up to 54d83efa44aac87983f973abb42c508a25a2b554: ipvs: fix build errors related to config option combinations (2012-10-23 09:23:40 +0900) ---------------------------------------------------------------- Jesper Dangaard Brouer (1): ipvs: fix build errors related to config option combinations include/net/ip_vs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html