Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/can/dev.c
8f106aa31e64 ("can: dev: prevent potential information leak in can_fill_info()")
9b92e0060875 ("can: dev: move driver related infrastructure into separate subdir")
4263a5473f69 ("can: dev: move netlink related code into seperate file")
Code move.
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
3391a454bc1d ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
e3c0fa63bfb7 ("net/mlx5e: Support HTB offload")
Adjacent code changes
net/switchdev/switchdev.c
d8f11a43e9cd ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
ab0339e67b7a ("net: switchdev: remove the transaction structure from port object notifiers")
7d6baef50e63 ("net: switchdev: remove the transaction structure from port attributes")
Transaction parameter gets dropped otherwise keep the fix.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>