Jakub Kicinski 0fe2f273ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/can/dev.c commit 03f16c5075 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e73 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-20 12:16:11 -08:00
..
asm	tools: Add missing stdio.h include to asm/bug.h header	2019-09-25 09:51:44 -03:00
asm-generic	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36	2019-05-24 17:27:11 +02:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-01-20 12:16:11 -08:00
nolibc	tools/nolibc: Fix a spelling error in a comment	2020-11-06 17:13:58 -08:00
tools	tools: bpf: fix license for a compat header file	2018-09-19 23:49:58 +02:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-01-20 12:16:11 -08:00
vdso	tools headers: Synchronize linux/bits.h with the kernel sources	2020-04-14 11:40:05 -03:00