|WARNING| pw135758-135760 [PATCH] [v3, 3/3] doc: update ice document for qos

|WARNING| pw135758-135760 [PATCH] [v3, 3/3] doc: update ice document for qos

[dpdklab]

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