Subject: Re: pull-request: bpf-next 2023-02-17

From: Jakub Kicinski <[email-masked]>
Date: Mon, 20 Feb 2023 16:12:55 -0800

On Fri, 17 Feb 2023 23:17:37 +0100 Daniel Borkmann wrote:
> There is a small merge conflict between aa1d3faf71a6 ("ice: Robustify
> cleaning/completing XDP Tx buffers") from bpf-next and recent merge in
> 675f176b4dcc ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"),
> result should look like the following (CC'ing Alexander & Maciej just in
> case):
> 
>   [...]
>                 if (tx_buf->type == ICE_TX_BUF_XSK_TX) {
>                         tx_buf->type = ICE_TX_BUF_EMPTY;
>                         ice_clean_xdp_tx_buf(xdp_ring, tx_buf);
>                 } else {
>   [...]

FWIW Olek provided a different resolution here:

https://lore.kernel.org/all/[email-masked]/

I took his, it's different.