Hi Stephen,
On 13/02/2023 00:20, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/intel/ice/ice_xsk.c
>
> between commit:
>
> 1f090494170e ("ice: xsk: Fix cleaning of XDP_TX frames")
>
> from the net tree and commit:
>
> a24b4c6e9aab ("ice: xsk: Do not convert to buff to frame for XDP_TX")
>
> from the net-next tree.
Thank you for having shared this patch! We had the same conflict on our
side:
Tested-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
