David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -07: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: count both sk and asoc sndbuf with skb truesize and sctp_chunk size	2018-10-18 11:23:47 -07:00
sctp.h	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
sm.h	sctp: fix the data size calculation in sctp_data_size	2018-10-17 22:32:21 -07: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: use the pmtu from the icmp packet to update transport pathmtu	2018-10-15 22:54:20 -07: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