Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-15 12:43:21 -07:00
..
j1939	net: j1939: j1939_session_fresh_new(): fix missing initialization of skbcnt	2020-10-08 23:28:09 +02:00
af_can.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
af_can.h	can: introduce CAN midlayer private and allocate it automatically	2019-09-04 13:29:14 +02:00
bcm.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
gw.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
isotp.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
Kconfig	can: isotp: implement cleanups / improvements from review	2020-10-12 10:06:08 +02:00
Makefile	can: add ISO 15765-2:2016 transport protocol	2020-10-07 23:18:33 +02:00
proc.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
raw.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00