From: David S. Miller <davem@davemloft.net>
Date: Thu, 4 Apr 2013 21:41:53 +0000 (-0400)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.9-rc6~9^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f;p=linux.git

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

Pablo Neira Ayuso says:

====================
The following patchset contains netfilter updates for your net tree,
they are:

* Fix missing the skb->trace reset in nf_reset, noticed by Gao Feng
  while using the TRACE target with several net namespaces.

* Fix prefix translation in IPv6 NPT if non-multiple of 32 prefixes
  are used, from Matthias Schiffer.

* Fix invalid nfacct objects with empty name, they are now rejected
  with -EINVAL, spotted by Michael Zintakis, patch from myself.

* A couple of fixes for wrong return values in the error path of
  nfnetlink_queue and nf_conntrack, from Wei Yongjun.
====================

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

4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f