tree c0194aaa4d716cd49909176885bf498dd6de8cd4
parent 7b8fc0103bb51d1d3e1fb5fd67958612e709f883
parent 75439bc439e0f02903b48efce84876ca92da97bd
author Jakub Kicinski <kuba@kernel.org> 1611173771 -0800
committer Jakub Kicinski <kuba@kernel.org> 1611173771 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

drivers/net/can/dev.c
  commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug")
  commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")

  Code move.

drivers/net/dsa/b53/b53_common.c
 commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
 commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")

 Field rename.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>