tree e4ecabf883d7fa5c8f30d9f9294c50ee1def75de
parent 7e14069651591c81046ffaec13c3dac8cb70f5fb
parent 960bd2c26421d321e890f1936938196ead41976f
author David S. Miller <davem@davemloft.net> 1431808822 -0400
committer David S. Miller <davem@davemloft.net> 1431808822 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter fixes for your net tree, they are:

1) Fix a leak in IPVS, the sysctl table is not released accordingly when
   destroying a netns, patch from Tommi Rantala.

2) Fix a build error when TPROXY and socket are built-in but IPv6 defrag is
   compiled as module, from Florian Westphal.

3) Fix TCP tracket wrt. RFC5961 challenge ACK when in LAST_ACK state, patch
   from Jesper Dangaard Brouer.

4) Fix a bogus WARN_ON() in nf_tables when deleting a set element that stores
   a map, from Mirek Kratochvil.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>