David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -07:00
..
associola.c	net: sctp: associola.c: delete duplicated words	2020-08-24 16:21:43 -07:00
auth.c	net: sctp: auth.c: delete duplicated words	2020-08-24 16:21:43 -07:00
bind_addr.c	net: sctp: bind_addr.c: delete duplicated word	2020-08-24 16:21:43 -07:00
chunk.c	net: sctp: chunk.c: delete duplicated word	2020-08-24 16:21:43 -07:00
debug.c
diag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-12 22:34:48 -07:00
endpointola.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
input.c	sctp: Add missing annotation for sctp_err_finish()	2020-02-24 13:26:48 -08:00
inqueue.c
ipv6.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile
objcnt.c
offload.c
output.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
outqueue.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
primitive.c
proc.c
protocol.c	net: sctp: protocol.c: delete duplicated words + punctuation	2020-08-24 16:21:43 -07:00
sm_make_chunk.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-04 21:28:59 -07:00
sm_sideeffect.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
sm_statefuns.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05: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	net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant	2020-09-20 14:15:12 -07:00
stream_interleave.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
stream_sched_prio.c
stream_sched_rr.c
stream_sched.c
stream.c	net: sctp: Fix negotiation of the number of data streams.	2020-08-20 16:37:37 -07:00
sysctl.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04: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
ulpevent.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
ulpqueue.c	net: sctp: ulpqueue.c: delete duplicated word	2020-08-24 16:21:43 -07:00