From: Jakub Kicinski <kuba@kernel.org>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: davem@davemloft.net, pabeni@redhat.com, edumazet@google.com,
ast@kernel.org, andrii@kernel.org, martin.lau@linux.dev,
netdev@vger.kernel.org, bpf@vger.kernel.org,
aleksander.lobakin@intel.com, maciej.fijalkowski@intel.com
Subject: Re: pull-request: bpf-next 2023-02-17
Date: Mon, 20 Feb 2023 16:12:55 -0800 [thread overview]
Message-ID: <20230220161255.79d9bc6b@kernel.org> (raw)
In-Reply-To: <20230217221737.31122-1-daniel@iogearbox.net>
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/a472728a-a4eb-391a-c517-06133e6bbc8c@intel.com/
I took his, it's different.
next prev parent reply other threads:[~2023-02-21 0:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 22:17 pull-request: bpf-next 2023-02-17 Daniel Borkmann
2023-02-21 0:12 ` Jakub Kicinski [this message]
2023-02-21 0:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230220161255.79d9bc6b@kernel.org \
--to=kuba@kernel.org \
--cc=aleksander.lobakin@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=maciej.fijalkowski@intel.com \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).