Hi all,

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

  drivers/net/ethernet/microsoft/mana/mana_en.c

between commit:

  f8fd56977eeea ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")

from the net tree and commit:

  d07efe5a6e641 ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")

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.

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
index d7de4c4d25bbe,26aef21c6c2c8..0000000000000
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@@ -2332,14 -2399,15 +2399,16 @@@ static void mana_destroy_txq(struct man
  			napi_synchronize(napi);
  			napi_disable_locked(napi);
  			netif_napi_del_locked(napi);
- 			apc->tx_qp[i].txq.napi_initialized = false;
+ 			apc->tx_qp[i]->txq.napi_initialized = false;
  		}
 -		mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
 -		if (apc->tx_qp[i].tx_object != INVALID_MANA_HANDLE)
++		if (apc->tx_qp[i]->tx_object != INVALID_MANA_HANDLE)
- 			mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object);
++			mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
  
- 		mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq);
+ 		mana_deinit_cq(apc, &apc->tx_qp[i]->tx_cq);
  
- 		mana_deinit_txq(apc, &apc->tx_qp[i].txq);
+ 		mana_deinit_txq(apc, &apc->tx_qp[i]->txq);
+ 
+ 		kvfree(apc->tx_qp[i]);
  	}
  
  	kfree(apc->tx_qp);