* [dpdk-test-report] |FAILURE| pw(72970) [v3, 3/3] doc: add cryptodev direct APIs guide
@ 2020-07-03 21:10 sys_stv
0 siblings, 0 replies; 4+ messages in thread
From: sys_stv @ 2020-07-03 21:10 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72970
_apply issues_
Submitter: Fan Zhang <roy.fan.zhang@intel.com>
Date: 2020-07-03 10:14:11
Reply_mail: 20200703101411.23091-4-roy.fan.zhang@intel.com
DPDK git baseline:
Repo:dpdk-next-crypto, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
* Repo: dpdk-next-crypto
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in doc: add cryptodev direct APIs guide. Version doc: add cryptodev direct APIs guide of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/cryptodev_lib.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
Use 'git am --show-current-patch' to see the failed patch
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".
* Repo: dpdk
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in doc: add cryptodev direct APIs guide. Version doc: add cryptodev direct APIs guide of doc/guides/rel_notes/release_20_08.rst left in tree.
Auto-merging doc/guides/prog_guide/cryptodev_lib.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-test-report] |FAILURE| pw(72970) [v3, 3/3] doc: add cryptodev direct APIs guide
@ 2020-07-08 2:36 sys_stv
0 siblings, 0 replies; 4+ messages in thread
From: sys_stv @ 2020-07-08 2:36 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72970
_apply issues_
Submitter: Fan Zhang <roy.fan.zhang@intel.com>
Date: 2020-07-03 10:14:11
Reply_mail: 20200703101411.23091-4-roy.fan.zhang@intel.com
DPDK git baseline:
Repo:dpdk-next-crypto, CommitID: 10cddc7193c297208e23e04789ff03973fb35faf
Repo:dpdk, CommitID: fea5a82f5643901f8259bb1250acf53d6be4b9cb
* Repo: dpdk-next-crypto
Auto-merging drivers/common/qat/qat_qp.c
Auto-merging drivers/common/qat/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 crypto/qat: add support to direct data-path APIs
Use 'git am --show-current-patch' to see the failed patch
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".
* Repo: dpdk
Auto-merging doc/guides/rel_notes/release_20_08.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-test-report] |FAILURE| pw(72970) [v3, 3/3] doc: add cryptodev direct APIs guide
@ 2020-07-06 8:01 sys_stv
0 siblings, 0 replies; 4+ messages in thread
From: sys_stv @ 2020-07-06 8:01 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72970
_apply issues_
Submitter: Fan Zhang <roy.fan.zhang@intel.com>
Date: 2020-07-03 10:14:11
Reply_mail: 20200703101411.23091-4-roy.fan.zhang@intel.com
DPDK git baseline:
Repo:dpdk-next-crypto, CommitID: cf51f1506f9d641d07b217bbab4b8944bd4d2a2f
Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3
* Repo: dpdk-next-crypto
Auto-merging drivers/crypto/qat/meson.build
Auto-merging drivers/common/qat/Makefile
error: Failed to merge in the changes.
Patch failed at 0001 crypto/qat: add support to direct data-path APIs
Use 'git am --show-current-patch' to see the failed patch
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".
* Repo: dpdk
Auto-merging doc/guides/rel_notes/release_20_08.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-test-report] |FAILURE| pw(72970) [v3, 3/3] doc: add cryptodev direct APIs guide
@ 2020-07-06 6:27 sys_stv
0 siblings, 0 replies; 4+ messages in thread
From: sys_stv @ 2020-07-06 6:27 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72970
_apply issues_
Submitter: Fan Zhang <roy.fan.zhang@intel.com>
Date: 2020-07-03 10:14:11
Reply_mail: 20200703101411.23091-4-roy.fan.zhang@intel.com
DPDK git baseline:
Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3
* Repo: dpdk
Auto-merging doc/guides/rel_notes/release_20_08.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_20_08.rst
error: Failed to merge in the changes.
Patch failed at 0003 doc: add cryptodev direct APIs guide
Use 'git am --show-current-patch' to see the failed patch
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".
DPDK STV team
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-08 2:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-03 21:10 [dpdk-test-report] |FAILURE| pw(72970) [v3, 3/3] doc: add cryptodev direct APIs guide sys_stv
2020-07-06 6:27 sys_stv
2020-07-06 8:01 sys_stv
2020-07-08 2:36 sys_stv
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).