David S. Miller
2ccba5433b
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>
2013-02-18 23:42:09 -05:00
2013-02-05 04:07:35 +01:00
2013-02-18 14:53:08 -05:00
2012-12-03 15:07:48 +01:00
2013-02-05 01:43:47 +01:00
2013-01-21 12:20:19 +01:00
2013-01-23 12:55:29 +01:00
2013-02-19 02:48:05 +01:00
2011-01-18 18:12:24 +01:00
2013-01-23 12:56:33 +01:00
2013-01-23 12:55:50 +01:00
2013-02-18 14:53:08 -05:00
2012-06-16 15:08:49 +02:00
2013-02-19 02:48:05 +01:00
2011-04-04 15:21:02 +02:00
2013-02-19 02:48:05 +01:00
2013-02-18 23:42:09 -05:00
2013-02-19 02:48:05 +01:00
2013-01-23 12:56:23 +01:00
2011-01-18 18:12:24 +01:00
2013-02-18 23:42:09 -05:00
2013-02-05 05:10:02 +01:00
2013-01-23 14:40:53 +01:00
2012-07-04 19:37:22 +02:00
2013-01-23 14:40:53 +01:00
2013-01-23 14:40:53 +01:00
2012-12-03 15:13:10 +01:00
2012-07-04 19:37:22 +02:00
2013-01-23 14:40:53 +01:00
2013-01-23 14:40:53 +01:00
2013-02-19 02:48:05 +01:00
2013-02-19 02:48:05 +01:00
2013-01-18 00:28:18 +01:00
2013-02-18 14:53:08 -05:00
2013-02-19 02:48:05 +01:00
2013-01-23 12:56:02 +01:00
2013-01-23 12:55:39 +01:00
2012-09-03 13:52:54 +02:00
2012-11-19 14:29:46 +01:00
2013-02-19 02:48:05 +01:00
2012-09-21 12:09:25 +02:00
2013-02-19 02:48:05 +01:00
2012-08-30 03:00:14 +02:00
2013-02-19 02:48:05 +01:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2012-08-30 03:00:14 +02:00
2013-02-19 02:48:05 +01:00
2013-02-19 02:48:05 +01:00
2012-12-03 15:07:48 +01:00
2011-02-17 11:32:38 +01:00
2012-09-10 15:30:41 -04:00
2012-09-24 14:29:40 +02:00
2012-11-21 23:50:14 +01:00
2012-12-17 01:16:17 +01:00
2012-12-03 15:07:48 +01:00
2012-06-23 02:13:38 +02:00
2013-02-05 04:07:35 +01:00
2013-02-18 14:53:08 -05:00
2011-12-16 15:49:52 -05:00
2011-12-03 09:35:10 -08:00
2013-01-21 12:20:19 +01:00
2010-07-15 17:20:46 +02:00
2010-11-15 13:57:56 +01:00
2011-12-25 02:21:45 -05:00
2013-01-18 00:28:15 +01:00
2012-06-07 14:58:39 +02:00
2011-05-10 12:13:36 +02:00
2011-01-18 06:33:54 +01:00
2013-02-05 01:49:26 +01:00
2011-02-03 00:05:43 +01:00
2011-05-10 10:00:21 +02:00
2011-12-27 20:45:25 +01:00
2013-02-18 14:53:08 -05:00
2011-07-01 16:11:15 -07:00
2011-07-01 16:11:15 -07:00
2012-11-09 17:05:07 -08:00
2011-11-01 09:19:49 +01:00
2011-02-04 14:28:58 -08:00
2012-09-28 11:34:33 +09:00
2011-01-18 06:33:54 +01:00
2012-09-26 01:33:16 +02:00
2012-10-02 11:11:09 -07:00
2012-05-09 20:49:18 -04:00
2012-10-15 13:39:12 +02:00
2012-09-21 12:11:08 +02:00
2011-12-25 02:43:17 +01:00
2012-08-20 12:45:57 +02:00
2012-08-20 12:45:57 +02:00
2012-08-14 21:55:30 -07:00
2011-10-31 19:30:28 -04:00
2011-07-29 16:24:46 +02:00
2011-07-20 14:10:19 -07:00
2013-02-18 14:53:08 -05:00
2012-09-21 12:12:05 +02:00
2010-10-21 10:12:48 +11:00
2012-09-22 22:44:34 +02:00
2012-09-03 13:31:39 +02:00
2011-10-31 19:30:28 -04:00
2012-05-15 13:45:03 -04:00
2011-12-16 15:49:52 -05:00
2012-10-17 11:00:31 +02:00
2012-09-24 14:29:01 +02:00
2012-07-10 23:13:45 -07:00
2ccba5433b