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

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

drivers/net/can/dev.c
  6da72c1fda6a ("can: dev: prevent potential information leak in can_fill_info()")
  6ac4eb9449c8 ("can: dev: move driver related infrastructure into separate subdir")
  4e4ea9358334 ("can: dev: move netlink related code into seperate file")

  Code move.

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
  091ae998635c ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
  63f9d5b33580 ("net/mlx5e: Support HTB offload")

  Adjacent code changes

net/switchdev/switchdev.c
  c567c530b78d ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
  262c4a98f5ef ("net: switchdev: remove the transaction structure from port object notifiers")
  a3a3894ec61e ("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>