From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: Re: [PATCH 00/22] ipvs namespaces v3.3 Date: Fri, 14 Jan 2011 14:26:15 +0100 Message-ID: <4D304EF7.5000604@trash.net> References: <1294883588-5683-1-git-send-email-horms@verge.net.au> <4D2EDDD0.8060903@netfilter.org> <4D2EE286.1040207@trash.net> <4D2EED37.6070108@netfilter.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Simon Horman , netfilter-devel@vger.kernel.org, lvs-devel@vger.kernel.org, netdev@vger.kernel.org, Julian Anastasov , Hans Schillstrom To: Pablo Neira Ayuso Return-path: In-Reply-To: <4D2EED37.6070108@netfilter.org> Sender: lvs-devel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 13.01.2011 13:16, Pablo Neira Ayuso wrote: > On 13/01/11 12:31, Patrick McHardy wrote: >> On 13.01.2011 12:11, Pablo Neira Ayuso wrote: >>> On 13/01/11 02:52, Simon Horman wrote: >>>> In order to create this series I merged net-next-2.6 into nf-next-2.6. >>>> The result is at >>>> git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 ipvs-netns3.3 >>>> >>>> However, I guess that you have already done your own merge and simply >>>> pulling the branch above will create a bit of a mess. Please let me know >>>> if you have a tree/branch that I should use as a base for a pull request. >>> >>> I have pulled it, everything was fine. Thanks Simon! >>> >> >> Thanks Pablo. I'm back up to speed, if you want, I can pull your tree >> into mine. > > Go ahead Patrick. I've pulled your tree in and pushed everything out. Thanks Pablo!