David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-09 12:13:43 -08:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	sctp: rename sctp_diag.c as diag.c	2018-02-13 13:56:31 -05:00
associola.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
auth.c	sctp: add sctp_auth_init and sctp_auth_free	2019-08-19 18:27:29 -07:00
bind_addr.c	sctp: remove rcu_read_lock from sctp_bind_addr_state	2019-07-08 20:18:11 -07:00
chunk.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
debug.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
diag.c	net: annotate lockless accesses to sk->sk_max_ack_backlog	2019-11-06 16:14:48 -08:00
endpointola.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
input.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
inqueue.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
ipv6.c	net: ipv6: add net argument to ip6_dst_lookup_flow	2019-12-04 12:27:12 -08:00
objcnt.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
offload.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
output.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
outqueue.c	sctp: add enabled check for path tracepoint loop.	2019-12-30 20:33:05 -08:00
primitive.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
proc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
protocol.c	sctp: fully initialize v4 addr in some functions	2019-12-09 10:16:39 -08:00
sm_make_chunk.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
sm_sideeffect.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
sm_statefuns.c	sctp: do trace_sctp_probe after SACK validation and check	2019-12-27 16:34:51 -08:00
sm_statetable.c	sctp: remove net sctp.x_enable working as a global switch	2019-08-19 18:27:29 -07:00
socket.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
stream.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-31 13:37:13 -08:00
stream_interleave.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
stream_sched.c	sctp: rename asoc intl_enable to asoc peer.intl_capable	2019-07-08 20:16:25 -07:00
stream_sched_prio.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
stream_sched_rr.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
sysctl.c	sctp: add support for Primary Path Switchover	2019-11-08 14:18:32 -08:00
transport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-31 13:37:13 -08:00
tsnmap.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
ulpevent.c	sctp: add SCTP_SEND_FAILED_EVENT event	2019-10-09 17:06:58 -07:00
ulpqueue.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00