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
..
netfilter
af_inet.c
ah4.c
arp.c
cipso_ipv4.c
datagram.c
devinet.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
esp4.c
fib_frontend.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
fib_lookup.h
fib_rules.c
fib_semantics.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
fib_trie.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
gre.c
icmp.c
igmp.c
inet_connection_sock.c
inet_diag.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
inet_fragment.c
inet_hashtables.c
inet_lro.c
inet_timewait_sock.c
inetpeer.c
ip_forward.c
ip_fragment.c
ip_gre.c
ip_input.c
ip_options.c
ip_output.c
ip_sockglue.c
ip_vti.c
ipcomp.c
ipconfig.c
ipip.c
ipmr.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
Kconfig
Makefile
netfilter.c
ping.c
proc.c
protocol.c
raw.c
route.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
syncookies.c
sysctl_net_ipv4.c
tcp_bic.c
tcp_cong.c
tcp_cubic.c
tcp_diag.c
tcp_fastopen.c
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c
tcp_input.c
tcp_ipv4.c
tcp_lp.c
tcp_memcontrol.c
tcp_metrics.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
tcp_minisocks.c
tcp_output.c
tcp_probe.c
tcp_scalable.c
tcp_timer.c
tcp_vegas.c
tcp_vegas.h
tcp_veno.c
tcp_westwood.c
tcp_yeah.c
tcp.c
tunnel4.c
udp_diag.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
udp_impl.h
udp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
udplite.c
xfrm4_input.c
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c
xfrm4_output.c
xfrm4_policy.c
xfrm4_state.c
xfrm4_tunnel.c