From: David S. Miller Date: Fri, 20 Feb 2015 22:36:20 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: v4.0~176^2~70 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee92259849b1616e4c23121f78eb1342d2b1ce1e;p=platform%2Fkernel%2Flinux-amlogic.git Merge git://git./pub/scm/linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== Netfilter/IPVS fixes for net The following patchset contains updates for your net tree, they are: 1) Fix removal of destination in IPVS when the new mixed family support is used, from Alexey Andriyanov via Simon Horman. 2) Fix module refcount undeflow in nft_compat when reusing a match / target. 3) Fix iptables-restore when the recent match is used with a new hitcount that exceeds threshold, from Florian Westphal. 4) Fix stack corruption in xt_socket due to using stack storage to save the inner IPv6 header, from Eric Dumazet. I'll follow up soon with another batch with more fixes that are still cooking. ==================== Signed-off-by: David S. Miller --- ee92259849b1616e4c23121f78eb1342d2b1ce1e