* [dpdk-test-report] |FAILURE| pw(72919) [1/2] net/enic: support VLAN push and pop flow actions
@ 2020-07-03 15:03 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-03 15:03 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72919
_apply issues_
Submitter: Hyong Youb Kim <hyonkim@cisco.com>
Date: 2020-07-03 02:23:50
Reply_mail: 20200703022351.17172-2-hyonkim@cisco.com
DPDK git baseline:
Repo:dpdk-next-net, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc
* Repo: dpdk-next-net
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): doc/guides/rel_notes/release_20_08.rst deleted in HEAD and modified in net/enic: support VLAN push and pop flow actions. Version net/enic: support VLAN push and pop flow actions of doc/guides/rel_notes/release_20_08.rst left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 net/enic: support VLAN push and pop flow actions
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
Applying: net/enic: support VLAN push and pop flow actions
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_08.rst).
error: could not build fake ancestor
Patch failed at 0001 net/enic: support VLAN push and pop flow actions
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(72919) [1/2] net/enic: support VLAN push and pop flow actions
@ 2020-07-06 4:22 sys_stv
0 siblings, 0 replies; 2+ messages in thread
From: sys_stv @ 2020-07-06 4:22 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/72919
_apply issues_
Submitter: Hyong Youb Kim <hyonkim@cisco.com>
Date: 2020-07-03 02:23:50
Reply_mail: 20200703022351.17172-2-hyonkim@cisco.com
DPDK git baseline:
Repo:dpdk, CommitID: 0fc601af3a722ca3ed8bc7cba4c01e377513cdb3
* Repo: dpdk
Applying: net/enic: support VLAN push and pop flow actions
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_08.rst).
error: could not build fake ancestor
Patch failed at 0001 net/enic: support VLAN push and pop flow actions
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 4:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-03 15:03 [dpdk-test-report] |FAILURE| pw(72919) [1/2] net/enic: support VLAN push and pop flow actions sys_stv
2020-07-06 4:22 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).