| commit | b48b63a1f6e26b0dec2c9f1690396ed4bcb66903 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Sep 15 11:43:53 2012 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Sep 15 11:43:53 2012 -0400 |
| tree | 8d9ad227c3a7d35cd78d40ecaf9bf59375dbd21a | |
| parent | 7f2e6a5d8608d0353b017a0fe15502307593734e [diff] | |
| parent | 3f0c3c8fe30c725c1264fb6db8cc4b69db3a658a [diff] |
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>