lkml.org 
[lkml]   [2023]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
From
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

\
 
 \ /
  Last update: 2023-03-26 23:58    [W:0.051 / U:2.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site