On Wed, Nov 09, 2011 at 09:58:07AM +0900, Simon Horman wrote: > 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://github.com/horms/ipvs-next.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://1984.lsi.us.es/net-next/.git master ? > > > > They are already in net davem's tree, they will be included in the > > upcoming 3.2 release. > > > > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet.git&a=search&h=HEAD&st=commit&s=Neira > > 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. The 1984.lsi.us.es trees are fine. There are no branch yet because I have no patches queued for upstream so far. You can use master if you don't see any nf branch, OK? -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
