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
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	ethernet: renesas: convert to SPDX identifiers	2018-09-10 10:11:53 -07:00
ravb.h	ravb: update "undocumented" annotations	2021-01-08 18:38:32 -08:00
ravb_main.c	ravb: remove APSR_DM	2021-01-08 18:37:54 -08:00
ravb_ptp.c	ptp: Introduce strict checking of external time stamp options.	2019-11-15 12:48:32 -08:00
sh_eth.c	sh_eth: Fix power down vs. is_opened flag ordering	2021-01-19 16:47:19 -08:00
sh_eth.h	sh_eth: use Gigabit register map for R7S72100	2020-02-16 19:44:41 -08:00