Merge tag 'ipvs-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 18 Sep 2015 19:03:32 +0000 (21:03 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 18 Sep 2015 19:05:03 +0000 (21:05 +0200)
commit36aea585a1103b8c2a1de04637b8a4326b92c254
tree9f77b21f8394adae3e031b83b749b526ab018fd1
parent47bbbb30b4331ec58a74a66a044341f0114b02b3
parent4e478098ac0ac1b6ef9a70fcdc2ec8b93f1b59a1
Merge tag 'ipvs-for-v4.4' of https://git./linux/kernel/git/horms/ipvs-next

Simon Horman says:

====================
IPVS Updates for v4.4

please consider these IPVS Updates for v4.4.

The updates include the following from Alex Gartrell:
* Scheduling of ICMP
* Sysctl to ignore tunneled packets; and hence some packet-looping scenarios
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipvs/ip_vs_xmit.c