David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
netfilter
addrconf_core.c
addrconf.c	ipv6: Consider RTF_CACHE when searching the fib6 tree	2015-05-01 20:57:06 -04:00
addrlabel.c
af_inet6.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
ah6.c
anycast.c
datagram.c
esp6.c
exthdrs_core.c
exthdrs_offload.c
exthdrs.c
fib6_rules.c
icmp.c
inet6_connection_sock.c
inet6_hashtables.c
ip6_checksum.c
ip6_fib.c
ip6_flowlabel.c	ipv6: Flow label state ranges	2015-05-03 21:58:01 -04:00
ip6_gre.c
ip6_icmp.c
ip6_input.c
ip6_offload.c
ip6_offload.h
ip6_output.c	ipv6: Fixed source specific default route handling.	2015-05-09 15:58:41 -04:00
ip6_tunnel.c
ip6_udp_tunnel.c	net: Modify sk_alloc to not reference count the netns of kernel sockets.	2015-05-11 10:50:18 -04:00
ip6_vti.c
ip6mr.c
ipcomp6.c
ipv6_sockglue.c
Kconfig
Makefile	net: Export IGMP/MLD message validation code	2015-05-04 14:49:23 -04:00
mcast_snoop.c	net: fix two sparse warnings introduced by IGMP/MLD parsing exports	2015-05-04 19:19:54 -04:00
mcast.c
mip6.c
ndisc.c
netfilter.c
output_core.c
ping.c
proc.c
protocol.c
raw.c
reassembly.c
route.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
sit.c
syncookies.c
sysctl_net_ipv6.c	ipv6: Flow label state ranges	2015-05-03 21:58:01 -04:00
tcp_ipv6.c
tcpv6_offload.c
tunnel6.c
udp_impl.h
udp_offload.c
udp.c
udplite.c
xfrm6_input.c
xfrm6_mode_beet.c
xfrm6_mode_ro.c
xfrm6_mode_transport.c
xfrm6_mode_tunnel.c
xfrm6_output.c
xfrm6_policy.c	ipv6: Remove DST_METRICS_FORCE_OVERWRITE and _rt6i_peer	2015-05-01 20:57:06 -04:00
xfrm6_protocol.c
xfrm6_state.c
xfrm6_tunnel.c