* [dpdk-test-report] |FAILURE| pw(72846) [v1] app/testpmd: add 5tswap forwarding engine
@ 2020-07-03 12:01 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-03 12:01 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72846
_apply issues_
Submitter: Shiri Kuzin <shirik@mellanox.com>
Date: 2020-07-02 15:16:14
Reply_mail: 1593702974-30927-1-git-send-email-shirik@mellanox.com
DPDK git baseline:
Repo:dpdk-next-net, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
* Repo: dpdk-next-net
Auto-merging app/test-pmd/testpmd.c
Auto-merging app/test-pmd/parameters.c
error: Failed to merge in the changes.
Patch failed at 0001 app/testpmd: add 5tswap forwarding engine
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 app/test-pmd/testpmd.c
Auto-merging app/test-pmd/parameters.c
error: Failed to merge in the changes.
Patch failed at 0001 app/testpmd: add 5tswap forwarding engine
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] 2+ messages in thread
* [dpdk-test-report] |FAILURE| pw(72846) [v1] app/testpmd: add 5tswap forwarding engine
@ 2020-07-06 3:01 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-06 3:01 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72846
_apply issues_
Submitter: Shiri Kuzin <shirik@mellanox.com>
Date: 2020-07-02 15:16:14
Reply_mail: 1593702974-30927-1-git-send-email-shirik@mellanox.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 0001 app/testpmd: add 5tswap forwarding engine
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] 2+ messages in thread
end of thread, other threads:[~2020-07-06 3:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-03 12:01 [dpdk-test-report] |FAILURE| pw(72846) [v1] app/testpmd: add 5tswap forwarding engine sys_stv
2020-07-06 3:01 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).