mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-22 12:21:00 +02:00
Conflicts: drivers/net/can/dev.c commit03f16c5075
("can: dev: can_restart: fix use after free bug") commit3e77f70e73
("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit8e4052c32d
("net: dsa: b53: fix an off by one in checking "vlan->vid"") commitb7a9e0da2d
("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>