Subject: linux-next: manual merge of the net-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 29 Jan 2021 11:43:09 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

between commit:

  57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")

from Linus' tree and commit:

  214baf22870c ("net/mlx5e: Support HTB offload")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 302001d6661e,2e5a0696374a..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@@ -447,7 -447,18 +447,18 @@@ int mlx5e_ethtool_set_channels(struct m
  		goto out;
  	}
  
+ 	/* Don't allow changing the number of channels if HTB offload is active,
+ 	 * because the numeration of the QoS SQs will change, while per-queue
+ 	 * qdiscs are attached.
+ 	 */
+ 	if (priv->htb.maj_id) {
+ 		err = -EINVAL;
+ 		netdev_err(priv->netdev, "%s: HTB offload is active, cannot change the number of channels\n",
+ 			   __func__);
+ 		goto out;
+ 	}
+ 
 -	new_channels.params = priv->channels.params;
 +	new_channels.params = *cur_params;
  	new_channels.params.num_channels = count;
  
  	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {