|WARNING| pw136499-136504 [PATCH] [v6, 6/6] baseband/fpga_5gnr_fec: cosmetic comment changes

|WARNING| pw136499-136504 [PATCH] [v6, 6/6] baseband/fpga_5gnr_fec: cosmetic comment changes

[dpdklab]

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

_apply patch failure_

Submitter: Hernan Vargas <hernan.vargas@intel.com>
Date: Wednesday, February 07 2024 17:13:50 
Applied on: CommitID:263729efd1eb998ba1d7829971ecee620c79d0ce
Apply patch set 136499-136504 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-baseband-for-main
Checked out to next-baseband-for-main (263729efd1eb998ba1d7829971ecee620c79d0ce)
Applying patch...

Failed to apply patch:
Applying: doc: fix fpga 5gnr configuration values
Applying: baseband/fpga_5gnr_fec: renaming for consistency
Using index info to reconstruct a base tree...
M	drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
CONFLICT (content): Merge conflict in drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 baseband/fpga_5gnr_fec: renaming for consistency
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 (263729efd1eb998ba1d7829971ecee620c79d0ce)
Applying patch...

Failed to apply patch:
Applying: doc: fix fpga 5gnr configuration values
Applying: baseband/fpga_5gnr_fec: renaming for consistency
Using index info to reconstruct a base tree...
M	drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
CONFLICT (content): Merge conflict in drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 baseband/fpga_5gnr_fec: renaming for consistency
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/29087/

UNH-IOL DPDK Community Lab