|WARNING| pw136948 [PATCH] [v3] common/qat: add virtual qat device (vQAT)

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Arkadiusz Kusztal <arkadiuszx.kusztal at 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