From: David S. Miller Date: Sat, 16 Jun 2012 22:23:35 +0000 (-0700) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next X-Git-Tag: v3.6-rc1~125^2~529 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=82f437b95052f99cafb8b4f39b08ad1d0b05c30d;p=linux.git Merge branch 'master' of git://1984.lsi.us.es/nf-next Pablo says: ==================== This is the second batch of Netfilter updates for net-next. It contains the kernel changes for the new user-space connection tracking helper infrastructure. More details on this infrastructure are provides here: http://lwn.net/Articles/500196/ Still, I plan to provide some official documentation through the conntrack-tools user manual on how to setup user-space utilities for this. So far, it provides two helper in user-space, one for NFSv3 and another for Oracle/SQLnet/TNS. Yet in my TODO list. ==================== Signed-off-by: David S. Miller --- 82f437b95052f99cafb8b4f39b08ad1d0b05c30d