From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: [GIT PULL nf-next 0/2] IPVS Updates for v3.15
Date: Fri, 7 Mar 2014 11:46:12 +0100
Message-ID: <20140307104612.GA11150@localhost>
References: <1394163974-25877-1-git-send-email-horms@verge.net.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
	netfilter-devel@vger.kernel.org,
	Wensong Zhang <wensong@linux-vs.org>,
	Julian Anastasov <ja@ssi.bg>
To: Simon Horman <horms@verge.net.au>
Return-path: <netdev-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <1394163974-25877-1-git-send-email-horms@verge.net.au>
Sender: netdev-owner@vger.kernel.org
List-Id: netfilter-devel.vger.kernel.org

On Fri, Mar 07, 2014 at 12:46:12PM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> please consider the following updates for IPVS for v3.15.
> 
> It consists of two cleanups.
> * Whitespace cleanup from Tingwei Liu
> * Section conflict cleanup from Andi Kleen
> 
> Please feel free to put Andi's patch into nf instead of nf-next if
> you think that is appropriate.

Pulled into nf-next, thanks Simon.