|WARNING| pw137515-137517 [PATCH] [v7, 3/3] test/cryptodev: add tests for GCM with 64 byte AAD

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ciara Power <ciara.power at intel.com>
Date: Thursday, February 29 2024 18:43:47 
Applied on: CommitID:8f27705b70911d12dc0f356a728d73279fbc1e84
Apply patch set 137515-137517 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-crypto-for-main
Checked out to next-crypto-for-main (8f27705b70911d12dc0f356a728d73279fbc1e84)
Applying patch...

Failed to apply patch:
Applying: common/qat: add support for GEN LCE device
Using index info to reconstruct a base tree...
M	doc/guides/cryptodevs/qat.rst
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/common/qat/meson.build
M	drivers/common/qat/qat_adf/icp_qat_fw.h
M	drivers/common/qat/qat_adf/icp_qat_fw_la.h
M	drivers/common/qat/qat_common.h
M	drivers/common/qat/qat_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/qat/qat_device.c
CONFLICT (content): Merge conflict in drivers/common/qat/qat_device.c
Auto-merging drivers/common/qat/qat_common.h
CONFLICT (content): Merge conflict in drivers/common/qat/qat_common.h
Auto-merging drivers/common/qat/qat_adf/icp_qat_fw_la.h
CONFLICT (content): Merge conflict in drivers/common/qat/qat_adf/icp_qat_fw_la.h
Auto-merging drivers/common/qat/qat_adf/icp_qat_fw.h
Auto-merging drivers/common/qat/meson.build
CONFLICT (content): Merge conflict in drivers/common/qat/meson.build
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
Auto-merging doc/guides/cryptodevs/qat.rst
CONFLICT (content): Merge conflict in doc/guides/cryptodevs/qat.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 support for GEN LCE device
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 (8f27705b70911d12dc0f356a728d73279fbc1e84)
Applying patch...

Failed to apply patch:
Applying: common/qat: add support for GEN LCE device
Using index info to reconstruct a base tree...
M	doc/guides/cryptodevs/qat.rst
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/common/qat/meson.build
M	drivers/common/qat/qat_adf/icp_qat_fw.h
M	drivers/common/qat/qat_adf/icp_qat_fw_la.h
M	drivers/common/qat/qat_common.h
M	drivers/common/qat/qat_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/qat/qat_device.c
CONFLICT (content): Merge conflict in drivers/common/qat/qat_device.c
Auto-merging drivers/common/qat/qat_common.h
CONFLICT (content): Merge conflict in drivers/common/qat/qat_common.h
Auto-merging drivers/common/qat/qat_adf/icp_qat_fw_la.h
CONFLICT (content): Merge conflict in drivers/common/qat/qat_adf/icp_qat_fw_la.h
Auto-merging drivers/common/qat/qat_adf/icp_qat_fw.h
Auto-merging drivers/common/qat/meson.build
CONFLICT (content): Merge conflict in drivers/common/qat/meson.build
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
Auto-merging doc/guides/cryptodevs/qat.rst
CONFLICT (content): Merge conflict in doc/guides/cryptodevs/qat.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 support for GEN LCE device
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/29347/

UNH-IOL DPDK Community Lab