Hi all,

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

  drivers/net/ethernet/engleder/tsnep_main.c

between commit:

  3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues")

from the net tree and commit:

  25faa6a4c5ca ("tsnep: Replace TX spin_lock with __netif_tx_lock")

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/engleder/tsnep_main.c
index 00e2108f2ca4,e9dfefba5973..000000000000
--- a/drivers/net/ethernet/engleder/tsnep_main.c
+++ b/drivers/net/ethernet/engleder/tsnep_main.c
@@@ -450,10 -458,8 +458,8 @@@ static netdev_tx_t tsnep_xmit_frame_rin
  		/* ring full, shall not happen because queue is stopped if full
  		 * below
  		 */
 -		netif_stop_queue(tx->adapter->netdev);
 +		netif_stop_subqueue(tx->adapter->netdev, tx->queue_index);
  
- 		spin_unlock_irqrestore(&tx->lock, flags);
- 
  		return NETDEV_TX_BUSY;
  	}
  
@@@ -493,11 -495,9 +495,9 @@@
  
  	if (tsnep_tx_desc_available(tx) < (MAX_SKB_FRAGS + 1)) {
  		/* ring can get full with next frame */
 -		netif_stop_queue(tx->adapter->netdev);
 +		netif_stop_subqueue(tx->adapter->netdev, tx->queue_index);
  	}
  
- 	spin_unlock_irqrestore(&tx->lock, flags);
- 
  	return NETDEV_TX_OK;
  }
  
@@@ -567,13 -701,13 +701,13 @@@ static bool tsnep_tx_poll(struct tsnep_
  	} while (likely(budget));
  
  	if ((tsnep_tx_desc_available(tx) >= ((MAX_SKB_FRAGS + 1) * 2)) &&
 -	    netif_queue_stopped(tx->adapter->netdev)) {
 -		netif_wake_queue(tx->adapter->netdev);
 +	    netif_tx_queue_stopped(nq)) {
 +		netif_tx_wake_queue(nq);
  	}
  
- 	spin_unlock_irqrestore(&tx->lock, flags);
+ 	__netif_tx_unlock(nq);
  
- 	return (budget != 0);
+ 	return budget != 0;
  }
  
  static bool tsnep_tx_pending(struct tsnep_tx *tx)

Hi Stephen,

On 27/01/2023 02:36, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/ethernet/engleder/tsnep_main.c
> 
> between commit:
> 
>   3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues")
> 
> from the net tree and commit:
> 
>   25faa6a4c5ca ("tsnep: Replace TX spin_lock with __netif_tx_lock")
> 
> from the net-next tree.

Thank you for the proposed patch. I had the same conflict on my side
with MPTCP when merging net-next with -net and your fix seems to do the
job correctly!

Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

On Fri, 27 Jan 2023 11:39:41 +0100 Matthieu Baerts wrote:
> On 27/01/2023 02:36, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the net-next tree got a conflict in:
> > 
> >   drivers/net/ethernet/engleder/tsnep_main.c
> > 
> > between commit:
> > 
> >   3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues")
> > 
> > from the net tree and commit:
> > 
> >   25faa6a4c5ca ("tsnep: Replace TX spin_lock with __netif_tx_lock")
> > 
> > from the net-next tree.  
> 
> Thank you for the proposed patch. I had the same conflict on my side
> with MPTCP when merging net-next with -net and your fix seems to do the
> job correctly!
> 
> Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>

BTW would it be possible to get these in form of rr-cache?
Or otherwise to import the resolution without fetching all objects 
from your trees?