Files
kernel_amazon_mt8127-common/include/linux
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-30 18:16:01 -07:00
2012-07-30 18:15:23 -07:00
2012-08-10 15:27:02 -04:00
2012-07-30 17:25:21 -07:00
2012-08-07 10:10:57 +02:00
2012-07-31 18:42:43 -07:00
2012-07-30 17:25:11 -07:00
2012-08-21 01:19:54 -07:00
2012-09-10 15:44:56 -04:00
2012-08-04 01:24:44 +04:00
2012-08-09 16:18:06 -07:00
2012-08-14 14:28:32 -07:00
2012-08-14 14:28:32 -07:00
2012-08-14 14:28:32 -07:00
2012-07-31 08:16:42 -05:00
2012-08-22 10:24:41 -04:00
2012-07-29 21:24:13 +04:00
2012-07-30 19:06:52 -04:00
2012-07-30 19:06:52 -04:00
2012-08-20 13:58:21 +02:00
2012-07-31 18:42:43 -07:00
2012-08-30 13:14:48 -04:00
2012-08-21 20:50:25 +02:00
2012-07-30 17:25:20 -07:00
2012-07-31 08:16:24 -06:00
2012-07-31 18:42:50 -07:00
2012-08-04 12:15:37 +04:00