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