|WARNING| pw136246-136248 [PATCH] [v4, 3/3] net/mlx5: add compare item support

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Suanming Mou <suanmingm at nvidia.com>
Date: Thursday, February 01 2024 02:30:03 
Applied on: CommitID:8e5cbd3d1f6f077abdcb2ef4de027603ba9af5ca
Apply patch set 136246-136248 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 (5eedf66ac0e5ce62cd333e523996c63a3c4c2c00)
Done: main commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (8e5cbd3d1f6f077abdcb2ef4de027603ba9af5ca)
Applying patch...

Failed to apply patch:
Applying: ethdev: rename action modify field data structure
Using index info to reconstruct a base tree...
M	app/test-pmd/cmdline_flow.c
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/mlx5/mlx5_flow.c
M	drivers/net/mlx5/mlx5_flow.h
M	drivers/net/mlx5/mlx5_flow_dv.c
A	drivers/net/mlx5/mlx5_flow_geneve.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/net/mlx5/mlx5_flow_geneve.c deleted in HEAD and modified in ethdev: rename action modify field data structure. Version ethdev: rename action modify field data structure of drivers/net/mlx5/mlx5_flow_geneve.c left in tree.
Auto-merging drivers/net/mlx5/mlx5_flow_dv.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_dv.c
Auto-merging drivers/net/mlx5/mlx5_flow.h
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow.h
Auto-merging drivers/net/mlx5/mlx5_flow.c
Auto-merging doc/guides/rel_notes/release_24_03.rst
Auto-merging app/test-pmd/cmdline_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: rename action modify field data structure
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 (8e5cbd3d1f6f077abdcb2ef4de027603ba9af5ca)
Applying patch...

Failed to apply patch:
Applying: ethdev: rename action modify field data structure
Using index info to reconstruct a base tree...
M	app/test-pmd/cmdline_flow.c
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/mlx5/mlx5_flow.c
M	drivers/net/mlx5/mlx5_flow.h
M	drivers/net/mlx5/mlx5_flow_dv.c
A	drivers/net/mlx5/mlx5_flow_geneve.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/net/mlx5/mlx5_flow_geneve.c deleted in HEAD and modified in ethdev: rename action modify field data structure. Version ethdev: rename action modify field data structure of drivers/net/mlx5/mlx5_flow_geneve.c left in tree.
Auto-merging drivers/net/mlx5/mlx5_flow_dv.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_dv.c
Auto-merging drivers/net/mlx5/mlx5_flow.h
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow.h
Auto-merging drivers/net/mlx5/mlx5_flow.c
Auto-merging doc/guides/rel_notes/release_24_03.rst
Auto-merging app/test-pmd/cmdline_flow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 ethdev: rename action modify field data structure
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/29008/

UNH-IOL DPDK Community Lab