David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-05-02 22:14:21 -04:00

..

auth.h

sctp: add sockopt SCTP_AUTH_DEACTIVATE_KEY

2018-03-14 13:48:27 -04:00

checksum.h

sctp: get sctphdr by offset in sctp_compute_cksum

2019-03-18 18:16:12 -07:00

command.h

sctp: avoid running the sctp state machine recursively

2019-05-01 09:18:57 -04:00

constants.h

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

sctp.h

sctp: implement memory accounting on rx path

2019-04-15 13:36:51 -07:00

sm.h

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08: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: convert to genradix

2019-03-12 10:04:02 -07:00

tsnmap.h

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ulpevent.h

sctp: define subscribe in sctp_sock as __u16

2018-11-19 12:25:43 -08:00

ulpqueue.h

sctp: Pass sk_buff_head explicitly to sctp_ulpq_tail_event().

2019-04-11 21:33:31 -07:00