|WARNING| pw136141-136142 [PATCH] [v5, 2/2] net/mlx5: add random item support

|WARNING| pw136141-136142 [PATCH] [v5, 2/2] net/mlx5: add random item support

[dpdklab]

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

_apply patch failure_

Submitter: Michael Baum <michaelba@nvidia.com>
Date: Thursday, January 25 2024 12:37:08 
Applied on: CommitID:2c4a4e999aae115861fba3ae39da684f66de1146
Apply patch set 136141-136142 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 (2ecc673e5e9a19850ba76d6a976596890f2dade1)
Done: main commit 2ecc673e5e9a19850ba76d6a976596890f2dade1
Trying to checkout branch: origin/next-net-mlx-for-next-net
Checked out to next-net-mlx-for-next-net (2c4a4e999aae115861fba3ae39da684f66de1146)
Applying patch...

Failed to apply patch:
Applying: net/mlx5/hws: add support for random number match
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/hws/mlx5dr_definer.c
M	drivers/net/mlx5/hws/mlx5dr_definer.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/mlx5/hws/mlx5dr_definer.h
Auto-merging drivers/net/mlx5/hws/mlx5dr_definer.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/hws/mlx5dr_definer.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/mlx5/hws: add support for random number match
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 (2c4a4e999aae115861fba3ae39da684f66de1146)
Applying patch...

Failed to apply patch:
Applying: net/mlx5/hws: add support for random number match
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/hws/mlx5dr_definer.c
M	drivers/net/mlx5/hws/mlx5dr_definer.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/mlx5/hws/mlx5dr_definer.h
Auto-merging drivers/net/mlx5/hws/mlx5dr_definer.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/hws/mlx5dr_definer.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/mlx5/hws: add support for random number match
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/28964/

UNH-IOL DPDK Community Lab