|WARNING| pw136793-136795 [PATCH] [v9, 3/3] net/af_xdp: support AF_XDP DP pinned maps

|WARNING| pw136793-136795 [PATCH] [v9, 3/3] net/af_xdp: support AF_XDP DP pinned maps

[dpdklab]

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

_apply patch failure_

Submitter: Maryam Tahhan <mtahhan@redhat.com>
Date: Wednesday, February 14 2024 17:03:53 
Applied on: CommitID:dccd6b7c68116a1cc044856aa35928e044640a8d
Apply patch set 136793-136795 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 (8d85afb19af706de662e7ee686e6e437f835c6e3)
Done: main commit 8d85afb19af706de662e7ee686e6e437f835c6e3
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (dccd6b7c68116a1cc044856aa35928e044640a8d)
Applying patch...

Failed to apply patch:
Applying: docs: AF_XDP Device Plugin
Applying: net/af_xdp: fix multi interface support for K8s
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
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
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 net/af_xdp: fix multi interface support for K8s
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 (dccd6b7c68116a1cc044856aa35928e044640a8d)
Applying patch...

Failed to apply patch:
Applying: docs: AF_XDP Device Plugin
Applying: net/af_xdp: fix multi interface support for K8s
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
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
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 net/af_xdp: fix multi interface support for K8s
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/29151/

UNH-IOL DPDK Community Lab