From: David S. Miller <davem@davemloft.net>
Date: Tue, 19 Feb 2013 04:42:09 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next
X-Git-Tag: firefly_0821_release~3680^2~1092^2~28
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ccba5433ba567046e49643eb21502d5ea91dc83;p=firefly-linux-kernel-4.4.55.git

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

Pablo Neira Ayuso says:

====================
The following patchset contain updates for your net-next tree, they are:

* Fix (for just added) connlabel dependencies, from Florian Westphal.

* Add aliasing support for conntrack, thus users can either use -m state
  or -m conntrack from iptables while using the same kernel module, from
  Jozsef Kadlecsik.

* Some code refactoring for the CT target to merge common code in
  revision 0 and 1, from myself.

* Add aliasing support for CT, based on patch from Jozsef Kadlecsik.

* Add one mutex per nfnetlink subsystem, from myself.

* Improved logging for packets that are dropped by helpers, from myself.
====================

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

2ccba5433ba567046e49643eb21502d5ea91dc83