* |WARNING| pw136948 [PATCH] [v3] common/qat: add virtual qat device (vQAT)
@ 2024-02-21 8:12 dpdklab
0 siblings, 0 replies; 3+ messages in thread
From: dpdklab @ 2024-02-21 8:12 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/136948
_apply patch failure_
Submitter: Arkadiusz Kusztal <arkadiuszx.kusztal@intel.com>
Date: Wednesday, February 21 2024 07:50:11
Applied on: CommitID:92d644f1d58838561d0996b2d4a9f5d276e41651
Apply patch set 136948 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 (92d644f1d58838561d0996b2d4a9f5d276e41651)
Done: main commit 92d644f1d58838561d0996b2d4a9f5d276e41651
Trying to checkout branch: origin/next-crypto-for-main
Checked out to next-crypto-for-main (92d644f1d58838561d0996b2d4a9f5d276e41651)
Applying patch...
Failed to apply patch:
Applying: common/qat: add virtual qat device (vQAT)
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M drivers/common/qat/qat_adf/icp_qat_hw.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/qat/qat_adf/icp_qat_hw.h
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 common/qat: add virtual qat device (vQAT)
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 (92d644f1d58838561d0996b2d4a9f5d276e41651)
Applying patch...
Failed to apply patch:
Applying: common/qat: add virtual qat device (vQAT)
Using index info to reconstruct a base tree...
M doc/guides/rel_notes/release_24_03.rst
M drivers/common/qat/qat_adf/icp_qat_hw.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/qat/qat_adf/icp_qat_hw.h
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 common/qat: add virtual qat device (vQAT)
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/29207/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-21 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240221075011.28413-1-arkadiuszx.kusztal@intel.com>
2024-02-21 7:26 ` |WARNING| pw136948 [PATCH v3] common/qat: add virtual qat device (vQAT) qemudev
2024-02-21 7:51 ` |SUCCESS| pw136948 [PATCH v3] common/qat: add virtual qat device vQAT checkpatch
2024-02-21 8:12 |WARNING| pw136948 [PATCH] [v3] common/qat: add virtual qat device (vQAT) dpdklab
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).