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