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