Skip to content
Snippets Groups Projects
Commit 0fe2f273 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Conflicts:

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

  Code move.

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

 Field rename.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7b8fc010 75439bc4
No related branches found
No related tags found
No related merge requests found
Showing
with 66 additions and 104 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment