From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Simon Horman <horms@verge.net.au>
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>,
Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Subject: Re: [GIT PULL nf-next] IPVS
Date: Wed, 9 Nov 2011 15:36:41 +0100 [thread overview]
Message-ID: <20111109143641.GA24174@1984> (raw)
In-Reply-To: <20111109005805.GA26937@verge.net.au>
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?
next prev parent reply other threads:[~2011-11-09 14:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-21 1:33 [GIT PULL nf-next] IPVS Simon Horman
2011-10-21 1:33 ` [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function Simon Horman
2011-10-21 1:33 ` [PATCH 2/2] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function Simon Horman
2011-10-21 7:27 ` [GIT PULL nf-next] IPVS Pablo Neira Ayuso
2011-11-07 3:07 ` Simon Horman
2011-11-07 8:29 ` Pablo Neira Ayuso
2011-11-09 0:58 ` Simon Horman
2011-11-09 14:36 ` Pablo Neira Ayuso [this message]
2011-11-10 1:22 ` Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2013-03-18 13:15 Simon Horman
2013-03-18 23:31 ` Pablo Neira Ayuso
2013-03-19 0:38 ` Simon Horman
2012-08-10 1:41 Simon Horman
2012-08-14 9:06 ` Pablo Neira Ayuso
2012-07-23 23:28 Simon Horman
2012-07-23 23:35 ` David Miller
2012-07-24 1:01 ` Simon Horman
2012-07-24 1:11 ` David Miller
2012-07-11 0:25 Simon Horman
2012-03-21 8:56 Simon Horman
2011-12-09 7:13 Simon Horman
2011-12-09 21:13 ` Pablo Neira Ayuso
2011-12-07 8:07 Simon Horman
2011-10-01 3:34 Simon Horman
2011-10-10 23:42 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111109143641.GA24174@1984 \
--to=pablo@netfilter.org \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=krzysztof.wilczynski@linux.com \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=wensong@linux-vs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.