Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
j1939	can: replace can_dlc as variable/element for payload length	2020-11-20 12:04:12 +01:00
Kconfig	can: isotp: Explain PDU in CAN_ISOTP help text	2020-11-03 22:30:31 +01:00
Makefile	can: add ISO 15765-2:2016 transport protocol	2020-10-07 23:18:33 +02:00
af_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08: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: gw: support modification of Classical CAN DLCs	2020-11-20 12:05:14 +01:00
isotp.c	can: isotp: padlen(): make const array static, makes object smaller	2020-11-03 22:30:32 +01:00
proc.c	can: proc: can_remove_proc(): silence remove_proc_entry warning	2020-11-03 22:24:19 +01:00
raw.c	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00