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@xxxxxxxxxxxx>
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?
