You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		10 years ago
..
Kconfig	…
Makefile	…
associola.c	net: sctp: Deletion of an unnecessary check before the function call "kfree"	10 years ago
auth.c	net: sctp: fix memory leak in auth key management	10 years ago
bind_addr.c	…
chunk.c	switch sctp_user_addto_chunk() and sctp_datamsg_from_user() to passing iov_iter	10 years ago
debug.c	…
endpointola.c	…
input.c	…
inqueue.c	net: sctp: fix remote memory pressure from excessive queueing	10 years ago
ipv6.c	…
objcnt.c	…
output.c	net: sctp: use MAX_HEADER for headroom reserve in output path	10 years ago
outqueue.c	…
primitive.c	…
probe.c	…
proc.c	sctp: replace seq_printf with seq_puts	10 years ago
protocol.c	Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	10 years ago
sm_make_chunk.c	net: sctp: fix passing wrong parameter header to param_type2af in sctp_process_param	10 years ago
sm_sideeffect.c	…
sm_statefuns.c	net: sctp: fix remote memory pressure from excessive queueing	10 years ago
sm_statetable.c	…
socket.c	net: sctp: fix race for one-to-many sockets in sendmsg's auto associate	10 years ago
ssnmap.c	…
sysctl.c	…
transport.c	…
tsnmap.c	…
ulpevent.c	…
ulpqueue.c	net: introduce SO_INCOMING_CPU	10 years ago