David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
associola.c	net: sctp: Deletion of an unnecessary check before the function call "kfree"	2015-02-02 19:29:43 -08:00
auth.c	net: sctp: fix memory leak in auth key management	2014-11-11 15:19:11 -05:00
bind_addr.c
chunk.c	switch sctp_user_addto_chunk() and sctp_datamsg_from_user() to passing iov_iter	2014-11-24 05:16:40 -05:00
debug.c
endpointola.c
input.c
inqueue.c
ipv6.c
Kconfig
Makefile
objcnt.c
output.c	net: sctp: use MAX_HEADER for headroom reserve in output path	2014-12-09 13:24:03 -05:00
outqueue.c
primitive.c
probe.c
proc.c
protocol.c
sm_make_chunk.c	net: sctp: fix passing wrong parameter header to param_type2af in sctp_process_param	2015-01-30 17:45:23 -08:00
sm_sideeffect.c
sm_statefuns.c
sm_statetable.c
socket.c	net: sctp: fix race for one-to-many sockets in sendmsg's auto associate	2015-01-17 23:52:20 -05:00
ssnmap.c
sysctl.c
transport.c
tsnmap.c
ulpevent.c
ulpqueue.c