From: David S. Miller Date: Mon, 24 Jun 2013 19:45:24 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: accepted/tizen/common/20141203.182822~2017^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3d9dd89b781bdcb14201847608b658442de812b;p=platform%2Fkernel%2Flinux-arm64.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== The following patchset contains five fixes for Netfilter/IPVS, they are: * A skb leak fix in fragmentation handling in case that helpers are in place, it occurs since the IPV6 NAT infrastructure, from Phil Oester. * Fix SCTP port mangling in ICMP packets for IPVS, from Julian Anastasov. * Fix event delivery in ctnetlink regarding the new connlabel infrastructure, from Florian Westphal. * Fix mangling in the SIP NAT helper, from Balazs Peter Odor. * Fix crash in ipt_ULOG introduced while adding netnamespace support, from Gao Feng. I'll take care of passing several of these patches to -stable once they hit Linus' tree. ==================== Signed-off-by: David S. Miller --- a3d9dd89b781bdcb14201847608b658442de812b