David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -07: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	sctp: allow authenticating DATA chunks that are bundled with COOKIE_ECHO	2015-06-12 14:18:20 -07: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	net: sctp: migrate most recently used transport to ktime	2014-06-11 12:23:17 -07:00
input.c	sctp: Change sctp to implement csum_levels	2014-08-29 20:41:11 -07:00
inqueue.c	net: sctp: fix remote memory pressure from excessive queueing	2014-10-14 12:46:22 -04:00
ipv6.c	ipv6: Add rt6_get_cookie() function	2015-05-25 13:25:34 -04:00
Kconfig
Makefile	net: sctp: Inline the functions from command.c	2014-07-08 14:38:48 -07:00
objcnt.c
output.c	sctp: Fix race between OOTB responce and route removal	2015-06-29 09:28:42 -07:00
outqueue.c	net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY	2014-07-22 13:32:11 -07:00
primitive.c
probe.c
proc.c	sctp: replace seq_printf with seq_puts	2014-10-30 19:40:16 -04:00
protocol.c	sctp: fix src address selection if using secondary addresses	2015-07-21 00:20:17 -07:00
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	net: sctp: Don't transition to PF state when transport has exhausted 'Path.Max.Retrans'.	2014-04-27 23:41:14 -04:00
sm_statefuns.c	sctp: fix cut and paste issue in comment	2015-07-21 00:21:32 -07:00
sm_statetable.c
socket.c	net: sctp: stop spamming klog with rfc6458, 5.3.2. deprecation warnings	2015-07-26 16:32:41 -07:00
ssnmap.c
sysctl.c	sctp: avoid to repeatedly declare external variables	2015-03-25 11:40:16 -04:00
transport.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
tsnmap.c
ulpevent.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
ulpqueue.c	net: introduce SO_INCOMING_CPU	2014-11-11 13:00:06 -05:00