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>
Subject: Re: [GIT 0/3] Second Round of IPVS Updates for v4.12
Date: Sat, 15 Apr 2017 10:59:13 +0200 [thread overview]
Message-ID: <20170415085913.GA3652@salvia> (raw)
In-Reply-To: <20170414000625.GB10583@salvia>
On Fri, Apr 14, 2017 at 02:06:25AM +0200, Pablo Neira Ayuso wrote:
> On Fri, Apr 14, 2017 at 08:51:19AM +0900, Simon Horman wrote:
> > On Fri, Apr 14, 2017 at 01:01:34AM +0200, Pablo Neira Ayuso wrote:
> > > Hi Simon,
> > >
> > > On Mon, Apr 10, 2017 at 09:58:32AM -0700, Simon Horman wrote:
> > > > Hi Pablo,
> > > >
> > > > please consider these clean-ups and enhancements to IPVS for v4.12.
> > > >
> > > > * Removal unused variable
> > > > * Use kzalloc where appropriate
> > > > * More efficient detection of presence of NAT extension
> > > >
> > > >
> > > > The following changes since commit 592d42ac7fd36408979e09bf2f170f2595dab7b8:
> > > >
> > > > Merge branch 'qed-IOV-cleanups' (2017-03-21 19:02:38 -0700)
> > > >
> > > > are available in the git repository at:
> > > >
> > > > https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs2-for-v4.12
> > >
> > > This says:
> > >
> > > $ git pull
> > > https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs2-for-v4.12
> > > fatal: Couldn't find remote ref ipvs2-for-v4.12
> > >
> > > I don't any tag for this name in:
> > >
> > > https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git/refs/tags
> >
> > Sorry about that, it looks like I forgot to push the tag.
> > It should be there now.
>
> I'm hitting a conflict between this and what I have in nf-next.git.
>
> If you can have a look, otherwise I will check tomorrow with fresher
> mind.
Fixed this here.
Pulled, thanks.
prev parent reply other threads:[~2017-04-15 8:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 16:58 [GIT 0/3] Second Round of IPVS Updates for v4.12 Simon Horman
2017-04-10 16:58 ` [PATCH 1/3] netfilter: ipvs: don't check for presence of nat extension Simon Horman
2017-04-10 16:58 ` [PATCH 2/3] netfilter: ipvs: Replace kzalloc with kcalloc Simon Horman
2017-04-10 16:58 ` [PATCH 3/3] ipvs: remove unused variable Simon Horman
2017-04-13 23:01 ` [GIT 0/3] Second Round of IPVS Updates for v4.12 Pablo Neira Ayuso
2017-04-13 23:51 ` Simon Horman
2017-04-14 0:06 ` Pablo Neira Ayuso
2017-04-15 8:59 ` Pablo Neira Ayuso [this message]
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=20170415085913.GA3652@salvia \
--to=pablo@netfilter.org \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--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.