|WARNING| pw137074 [PATCH] [v3] net/af_xdp: fix resources leak when xsk configure fails

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137074

_apply patch failure_

Submitter: Yunjian Wang <wangyunjian at huawei.com>
Date: Friday, February 23 2024 01:45:45 
Applied on: CommitID:8c261a499faa28088489a141238f918be00807bb
Apply patch set 137074 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (8c261a499faa28088489a141238f918be00807bb)
Applying patch...

Failed to apply patch:
Applying: net/af_xdp: fix resources leak when xsk configure fails
Using index info to reconstruct a base tree...
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/af_xdp: fix resources leak when xsk configure fails
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Trying to checkout branch: main
Checked out to main (8c261a499faa28088489a141238f918be00807bb)
Applying patch...

Failed to apply patch:
Applying: net/af_xdp: fix resources leak when xsk configure fails
Using index info to reconstruct a base tree...
M	drivers/net/af_xdp/rte_eth_af_xdp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/af_xdp/rte_eth_af_xdp.c
CONFLICT (content): Merge conflict in drivers/net/af_xdp/rte_eth_af_xdp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/af_xdp: fix resources leak when xsk configure fails
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


https://lab.dpdk.org/results/dashboard/patchsets/29232/

UNH-IOL DPDK Community Lab