|WARNING| pw137651 [PATCH] net/mlx5: fix VID assignment in VLAN modify

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Gregory Etelson <getelson at nvidia.com>
Date: Friday, March 01 2024 06:04:48 
Applied on: CommitID:387aefe9fab8f1033071659a758ccda61a220ffd
Apply patch set 137651 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 (5df34de5808a7b826b8bc035d6ee3161a12be364)
Done: main commit 5df34de5808a7b826b8bc035d6ee3161a12be364
Trying to checkout branch: origin/next-net-mlx-for-next-net
Checked out to next-net-mlx-for-next-net (387aefe9fab8f1033071659a758ccda61a220ffd)
Applying patch...

Failed to apply patch:
Applying: net/mlx5: fix VID assignment in VLAN modify
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/mlx5_flow_hw.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/mlx5/mlx5_flow_hw.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.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: fix VID assignment in VLAN modify
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 (387aefe9fab8f1033071659a758ccda61a220ffd)
Applying patch...

Failed to apply patch:
Applying: net/mlx5: fix VID assignment in VLAN modify
Using index info to reconstruct a base tree...
M	drivers/net/mlx5/mlx5_flow_hw.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/mlx5/mlx5_flow_hw.c
CONFLICT (content): Merge conflict in drivers/net/mlx5/mlx5_flow_hw.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: fix VID assignment in VLAN modify
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/29359/

UNH-IOL DPDK Community Lab