From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw136499-136504 [PATCH] [v6, 6/6] baseband/fpga_5gnr_fec: cosmetic comment changes
Date: Wed, 07 Feb 2024 14:52:50 -0800 (PST) [thread overview]
Message-ID: <65c409c2.630a0220.cae69.55ffSMTPIN_ADDED_MISSING@mx.google.com> (raw)
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
reply other threads:[~2024-02-07 22:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65c409c2.630a0220.cae69.55ffSMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).