From: David S. Miller Date: Thu, 13 Sep 2012 17:53:06 +0000 (-0400) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf X-Git-Tag: v3.6-rc6~18^2~14 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=930521695c183c8a4da8fe13ce231cf5263b8d98;p=linux.git Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso say: ==================== The following patchset contains four updates for your net tree, they are: * Fix crash on timewait sockets, since the TCP early demux was added, in nfnetlink_log, from Eric Dumazet. * Fix broken syslog log-level for xt_LOG and ebt_log since printk format was converted from <.> to a 2 bytes pattern using ASCII SOH, from Joe Perches. * Two security fixes for the TCP connection tracking targeting off-path attacks, from Jozsef Kadlecsik. The problem was discovered by Jan Wrobel and it is documented in: http://mixedbit.org/reflection_scan/reflection_scan.pdf. ==================== Signed-off-by: David S. Miller --- 930521695c183c8a4da8fe13ce231cf5263b8d98