From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw137515-137517 [PATCH] [v7, 3/3] test/cryptodev: add tests for GCM with 64 byte AAD
Date: Thu, 29 Feb 2024 12:01:53 -0800 (PST) [thread overview]
Message-ID: <65e0e2b1.050a0220.6da47.5a16SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20240229184347.2496000-4-ciara.power@intel.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137515
_apply patch failure_
Submitter: Ciara Power <ciara.power@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
prev parent reply other threads:[~2024-02-29 20:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240229184347.2496000-4-ciara.power@intel.com>
2024-02-29 18:20 ` |SUCCESS| pw137515-137517 [PATCH v7 " qemudev
2024-02-29 18:25 ` qemudev
2024-02-29 18:44 ` |SUCCESS| pw137517 " checkpatch
2024-02-29 20:01 ` dpdklab [this message]
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=65e0e2b1.050a0220.6da47.5a16SMTPIN_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).