Skip to content

Commit 265e13e

Browse files
matttbematttbe
committed
conflicts in net/xdp/xsk.c
net: 0ebc27a4c67d ("xsk: avoid data corruption on cq descriptor number") net-next: 8da7bea7db69 ("xsk: add indirect call for xsk_destruct_skb") Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
1 parent daec87b commit 265e13e

File tree

2 files changed

+3932
-0
lines changed

2 files changed

+3932
-0
lines changed

0 commit comments

Comments
 (0)