From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Horman <horms@verge.net.au>
Subject: Re: [GIT PULL nf-2.6] IPVS
Date: Thu, 3 Mar 2011 07:06:37 +0900
Message-ID: <20110302220637.GD8193@verge.net.au>
References: <1299020375-11362-1-git-send-email-horms@verge.net.au>
 <4D6E22CA.2020305@trash.net>
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, netfilter@vger.kernel.org,
	Hans Schillstrom <hans@schillstrom.com>,
	Julian Anastasov <ja@ssi.bg>
To: Patrick McHardy <kaber@trash.net>
Return-path: <netfilter-devel-owner@vger.kernel.org>
Received: from kirsty.vergenet.net ([202.4.237.240]:46963 "EHLO
	kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754516Ab1CBWGl (ORCPT
	<rfc822;netfilter-devel@vger.kernel.org>);
	Wed, 2 Mar 2011 17:06:41 -0500
Content-Disposition: inline
In-Reply-To: <4D6E22CA.2020305@trash.net>
Sender: netfilter-devel-owner@vger.kernel.org
List-ID: <netfilter-devel.vger.kernel.org>

On Wed, Mar 02, 2011 at 11:58:18AM +0100, Patrick McHardy wrote:
> Am 01.03.2011 23:59, schrieb Simon Horman:
> > Hi Patrick,
> > 
> > please consider pulling
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git for-patrick
> > to get the following change from Julian. Please note that it is an nf-2.6
> > (that is 2.6.38-rc) change.
> > 
> > Julian Anastasov (1):
> >       ipvs: fix dst_lock locking on dest update
> 
> Pulled, thanks Simon.

Thanks Patrick.

This change is also needed in nf-next-2.6 but I assume that
will automatically happen when nf-2.6 is merged into nf-next-2.6,
possibly via a merge of net-2.6 into net-next-2.6.