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