[PATCH 0/2] netfilter updates for net tree

From: Pablo Neira Ayuso <pablo@netfilter.org>

Hi David,

This patchset revert the previous fix for ctnetlink soft lockup when
the conntrack table is full. There was a race condition between the
possible creation of the conntrack by one packet and ctnetlink itself.
Then it follows the new fix which is complete.

I'm sorry for puzzling, I'll put more care on this next time.

You can pull these changes from:

git://1984.lsi.us.es/net master

Thanks.

Jozsef Kadlecsik (1):
  netfilter: ctnetlink: fix soft lockup when netlink adds new entries
    (v2)

Pablo Neira Ayuso (1):
  Revert "netfilter: ctnetlink: fix soft lockup when netlink adds new
    entries"

 include/net/netfilter/nf_conntrack.h |    2 +-
 net/netfilter/nf_conntrack_core.c    |   38 ++++++++++++++++++++++++++++++---
 net/netfilter/nf_conntrack_netlink.c |   11 +++------
 3 files changed, 39 insertions(+), 12 deletions(-)

-- 
1.7.7.3