David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
auth.h	sctp: add sockopt SCTP_AUTH_DEACTIVATE_KEY	2018-03-14 13:48:27 -04:00
checksum.h	sctp: force the params with right types for sctp csum apis	2017-11-28 11:00:13 -05:00
command.h	sctp: add SCTP_AUTH_NO_AUTH type for AUTHENTICATION_EVENT	2018-03-14 13:48:27 -04:00
constants.h	sctp: remove old and unused SCTP_MIN_PMTU	2018-04-27 14:35:22 -04:00
sctp.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
sm.h	sctp: allow sctp_init_cause to return errors	2018-05-01 12:09:35 -04:00
stream_interleave.h	sctp: implement handle_ftsn for sctp_stream_interleave	2017-12-15 13:52:22 -05:00
stream_sched.h	sctp: remove extern from stream sched	2017-11-28 11:00:13 -05:00
structs.h	sctp: introduce sctp_assoc_update_frag_point	2018-04-27 14:35:23 -04:00
tsnmap.h
ulpevent.h	sctp: implement abort_pd for sctp_stream_interleave	2017-12-11 11:23:05 -05:00
ulpqueue.h	sctp: add support for the process of unordered idata	2017-12-11 11:23:05 -05:00