Merge tag 'ipvs3-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 5 Oct 2015 15:25:54 +0000 (17:25 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 5 Oct 2015 15:27:06 +0000 (17:27 +0200)
Simon Horman says:

====================
Third Round of IPVS Updates for v4.4

please consider this build fix from Eric Biederman which resolves
a build problem introduced in is excellent work to cleanup IPVS which
you recently pulled: its queued up for v4.4 so no need to worry
about earlier kernel versions.

I have another minor cleanup, to fix a build warning, pending.
However, I wanted to send this one to you now as its hit nf-next,
net-next and in turn next, and a slow trickle of bug reports are appearing.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Trivial merge