|WARNING| pw136335-136336 [PATCH] [2/2] net/mlx5: improve pattern template validation

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Gregory Etelson <getelson at nvidia.com>
Date: Friday, February 02 2024 15:06:17 
Applied on: CommitID:1d3700bd8452e2c62254499ef83f22f5ec7714dc
Apply patch set 136335-136336 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 (a4ce111cc89f580b8c4aad51bdb061acbdfde86b)
Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b
Trying to checkout branch: origin/next-net-mlx-for-next-net
Checked out to next-net-mlx-for-next-net (1d3700bd8452e2c62254499ef83f22f5ec7714dc)
Applying patch...

Failed to apply patch:
Applying: net/mlx5/hws: definer, update pattern validations
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/hws/mlx5dr_definer.c
Falling back to patching base and 3-way merge...
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: definer, update pattern validations
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 (1d3700bd8452e2c62254499ef83f22f5ec7714dc)
Applying patch...

Failed to apply patch:
Applying: net/mlx5/hws: definer, update pattern validations
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/hws/mlx5dr_definer.c
Falling back to patching base and 3-way merge...
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: definer, update pattern validations
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/29041/

UNH-IOL DPDK Community Lab