Re: [GIT PULL nf-next] IPVS

To: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Subject: Re: [GIT PULL nf-next] IPVS
Cc: lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Krzysztof Wilczynski <krzysztof.wilczynski@xxxxxxxxx>
From: Simon Horman <horms@xxxxxxxxxxxx>
Date: Wed, 9 Nov 2011 09:58:07 +0900
Hi Pablo,

On Mon, Nov 07, 2011 at 09:29:56AM +0100, Pablo Neira Ayuso wrote:
> Hi Simon,
> On Mon, Nov 07, 2011 at 12:07:01PM +0900, Simon Horman wrote:
> > Hi Pablo,
> > 
> > I am a little confused. The nf-next branch seems to have disappeared.
> > 
> > Could you consider pulling git:// master
> > to get the following changes that were in your nf-next branch.
> I was late to get it into net-next. Since net-next became net after
> the 3.1 release, my moved those changes to net to get it into 3.2
> once Linus announced that the merge window was opened again.
> > Or would
> > you like me to rebase the ipvs patches (9 or the 11 changes below) on
> > top of git:// master ?
> They are already in net davem's tree, they will be included in the
> upcoming 3.2 release.

Thanks, and sorry for missing that when I checked yesterday.

Could you suggest which tree and branch I should base the master branch of my
ipvs and ipvs-next trees on? Their purposes are to provide a reference for
people wishing to fix or enhance IPVS and a mechanism to send pull requests to
you. As of now I am using the master branch of your net tree for both.

To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at

<Prev in Thread] Current Thread [Next in Thread>