tree 4c320850df35decb34e4b2f5a9d9ef7f9258abe1
parent f350ca03703133c94fe742f6fa6ff0fd8f5a9a09
parent 894e2ac82bd0029adce7ad6c8d25501fdd82c994
author David S. Miller <davem@davemloft.net> 1360865764 -0500
committer David S. Miller <davem@davemloft.net> 1360865764 -0500

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes, they are:

* Fix conntrack helper re-assignment after NAT mangling if only if
  the same helper is attached to the conntrack again, from Florian
  Westphal.

* Don't allow the creation of conntrack entries via ctnetlink if the
  original and reply tuples are missing, from Florian Westphal.

* Fix broken sysctl interface in nf_ct_reasm while adding netns support
  to it, from Michal Kubecek.
====================

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