|
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.
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
