Merge tag 'ipvs2-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 6 May 2016 09:50:52 +0000 (11:50 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 6 May 2016 09:50:52 +0000 (11:50 +0200)
commitbbe848ec1a77dd2f9e739a7d5dca11d2ea11c09d
treea3d555a61c423779642a04bce94dc02d0b476254
parent0a93aaedc46af2c5feecfb1066d98bfb491ec0b8
parent698e2a8dca98e4de32f3f630e6d9cd93753c52e1
Merge tag 'ipvs2-for-v4.7' of https://git./linux/kernel/git/horms/ipvs-next

Simon Horman says:

====================
Second Round of IPVS Updates for v4.7

please consider these enhancements to the IPVS. They allow its DoS
mitigation strategy effective in conjunction with the SIP persistence
engine.
====================

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