David S. Miller b48b63a1f6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
net/netfilter/nfnetlink_log.c
net/netfilter/xt_LOG.c
Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.
Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.
Signed-off-by: David S. Miller <davem@davemloft.net >
2012-09-15 11:43:53 -04:00
2012-08-21 17:36:33 -06:00
2012-03-30 03:30:19 -04:00
2012-03-30 16:03:15 -07:00
2012-07-30 20:37:01 -03:00
2012-03-23 16:58:33 -07:00
2012-04-16 14:37:13 +02:00
2012-08-09 15:28:05 +02:00
2012-03-30 16:03:15 -07:00
2011-09-27 18:08:04 +02:00
2012-07-31 18:42:43 -07:00
2012-06-26 21:19:02 -07:00
2011-11-08 10:23:29 +01:00
2012-03-30 01:52:58 -04:00
2012-04-03 13:09:18 +02:00
2011-12-12 14:14:31 -08:00
2012-08-01 09:02:01 -07:00
2012-09-15 11:43:53 -04:00
2012-08-21 16:54:38 -07:00
2012-05-21 16:58:23 -07:00
2012-07-30 19:03:41 -07:00
2012-03-20 10:09:28 +00:00
2012-04-20 09:24:27 -07:00
2012-07-30 17:25:22 -07:00
2012-03-30 16:03:15 -07:00
2012-08-21 16:45:02 -07:00
2011-09-27 18:08:04 +02:00
2012-06-18 13:42:03 +02:00
2012-07-21 21:48:44 -07:00
2012-09-10 10:14:02 +02:00
2012-03-07 16:08:24 +01:00
2012-03-30 16:03:15 -07:00
2012-07-24 23:55:03 -07:00
2012-07-31 08:16:22 -06:00
2012-03-30 16:03:15 -07:00
2012-05-28 10:37:56 -07:00
2012-07-18 18:35:57 -07:00
2012-02-15 14:48:01 -08:00
2012-08-04 12:15:09 +04:00
2012-07-24 16:00:51 +08:00
2011-08-03 14:25:21 -10:00
2012-05-02 00:10:49 -07:00
2012-06-13 13:38:25 -07:00
2012-01-11 23:58:43 -05:00
2012-08-31 20:02:18 -04:00
2012-07-09 16:42:11 -04:00
2012-04-16 14:37:13 +02:00
2011-09-27 18:08:04 +02:00
2012-07-31 18:08:25 -07:00
2012-05-22 14:37:24 +10:00
2012-07-08 00:25:48 +10:00
2011-11-02 16:07:02 -07:00
2012-07-02 12:34:03 -07:00
2012-03-30 16:03:15 -07:00
2012-05-17 13:48:56 +02:00
2012-05-23 17:12:06 -07:00
2012-08-10 19:58:07 +10:00
2012-05-17 19:02:14 -04:00
2012-08-01 10:42:26 -07:00
2012-03-07 19:19:48 -07:00
2012-08-04 12:15:09 +04:00
2012-02-10 09:52:18 +01:00
2012-07-24 23:20:40 -04:00
2011-09-27 18:08:04 +02:00
2012-05-08 14:17:25 +02:00
2012-06-15 14:32:30 +03:00
2012-07-31 18:47:44 -07:00
2012-07-24 12:01:20 -07:00
2012-08-21 16:45:03 -07:00
2012-08-16 12:33:59 -07:00
2012-08-29 17:12:58 +02:00
2012-07-26 13:13:25 -07:00
2012-05-07 17:20:27 -07:00
2012-05-17 19:06:13 -04:00
2011-12-11 10:31:58 -08:00
2011-09-27 18:08:04 +02:00
2012-03-16 20:35:01 +00:00
2012-01-14 22:25:56 +01:00
2012-05-31 17:49:26 -07:00
2012-03-29 15:38:31 +10:30
2012-03-23 16:58:37 -07:00
2012-06-03 12:05:50 +02:00
2011-11-09 12:10:37 +02:00
2011-11-02 16:07:02 -07:00
2012-07-30 12:25:47 +02:00
2012-05-25 12:51:11 +05:30
2012-03-07 16:08:24 +01:00
2012-07-13 15:08:25 +02:00
2012-04-30 16:26:30 -04:00
2012-07-29 21:11:05 -03:00
2012-05-17 19:06:13 -04:00
2011-08-13 18:34:03 -07:00
2012-09-15 11:43:53 -04:00
2012-04-05 21:24:06 -07:00
2012-04-19 19:13:08 -07:00
2011-09-21 19:45:34 +03:00
2012-05-25 16:18:34 +02:00
2012-07-11 14:59:17 +01:00
2011-09-27 18:08:04 +02:00
2012-07-30 10:11:31 -07:00
2011-12-02 16:12:42 +00:00
2012-02-15 14:48:01 -08:00
2011-12-11 10:31:23 -08:00
2012-02-11 15:11:28 +01:00
2012-01-30 12:54:40 -05:00
2012-05-09 13:59:09 -07:00
2012-06-28 12:03:15 +02:00
2011-12-23 10:17:51 +11:00
2012-05-14 08:44:11 -03:00
2011-09-27 18:08:04 +02:00
2012-04-16 14:37:13 +02:00
2012-03-30 16:03:15 -07:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2012-03-30 16:03:15 -07:00
2012-08-17 11:09:58 +02:00
2012-07-30 17:25:14 -07:00
2012-06-15 12:56:53 +02:00
2012-07-17 10:14:17 -07:00
2012-07-06 00:53:27 +03:00
2011-09-27 18:08:04 +02:00
2012-02-08 22:53:58 +02:00
2012-06-25 12:11:58 -07:00
2012-04-16 14:37:13 +02:00
2011-08-13 18:34:03 -07:00
2012-05-25 16:18:30 +02:00
2012-03-30 16:03:15 -07:00
2012-07-31 08:16:23 -06:00
2012-01-02 13:04:55 +01:00
2012-05-08 16:01:34 -07:00
2012-07-13 22:24:45 -07:00
b48b63a1f6
