From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw135758-135760 [PATCH] [v3, 3/3] doc: update ice document for qos
Date: Fri, 05 Jan 2024 08:09:48 -0800 (PST) [thread overview]
Message-ID: <659829cc.170a0220.c2c07.103bSMTPIN_ADDED_MISSING@mx.google.com> (raw)
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/135758
_apply patch failure_
Submitter: Zhang, Qi Z <qi.z.zhang@intel.com>
Date: Friday, January 05 2024 21:12:37
Applied on: CommitID:6ef07151aac4b4d9601d547f94a996d1c71b3871
Apply patch set 135758-135760 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
v23.11-44-g6ef0715
Done: main commit 6ef07151aac4b4d9601d547f94a996d1c71b3871
Applying patch...
Failed to apply patch:
Applying: net/ice: hide port and TC layer in Tx sched tree
Using index info to reconstruct a base tree...
M drivers/net/ice/ice_ethdev.h
M drivers/net/ice/ice_tm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/ice_tm.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_tm.c
Auto-merging drivers/net/ice/ice_ethdev.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ice: hide port and TC layer in Tx sched tree
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
v23.11-44-g6ef0715
Applying patch...
Failed to apply patch:
Applying: net/ice: hide port and TC layer in Tx sched tree
Using index info to reconstruct a base tree...
M drivers/net/ice/ice_ethdev.h
M drivers/net/ice/ice_tm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ice/ice_tm.c
CONFLICT (content): Merge conflict in drivers/net/ice/ice_tm.c
Auto-merging drivers/net/ice/ice_ethdev.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ice: hide port and TC layer in Tx sched tree
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/28810/
UNH-IOL DPDK Community Lab
reply other threads:[~2024-01-05 16:09 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=659829cc.170a0220.c2c07.103bSMTPIN_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).