mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 04:32:03 +00:00
b48b63a1f6
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> |
||
|---|---|---|
| .. | ||
| actions.c | ||
| datapath.c | ||
| datapath.h | ||
| dp_notify.c | ||
| flow.c | ||
| flow.h | ||
| Kconfig | ||
| Makefile | ||
| vport-internal_dev.c | ||
| vport-internal_dev.h | ||
| vport-netdev.c | ||
| vport-netdev.h | ||
| vport.c | ||
| vport.h | ||