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

No conflicts!

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index dde8c03,dcf9f27..7d56a92
--- 1/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@@ -676,11 -678,10 +675,9 @@@ static int mlx5_devlink_rdma_param_regi
  
  static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)
  {
-       struct mlx5_core_dev *dev = devlink_priv(devlink);
- 
-       if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND) || MLX5_ESWITCH_MANAGER(dev))
+       if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
                return;
  
 -      devlink_param_unpublish(devlink, &enable_rdma_param);
        devlink_param_unregister(devlink, &enable_rdma_param);
  }