* [dpdk-test-report] |FAILURE| pw(83793) [v2] net/i40e: fix incorrect FDIR flex configuration
@ 2020-11-06 9:38 sys_stv
0 siblings, 0 replies; only message in thread
From: sys_stv @ 2020-11-06 9:38 UTC (permalink / raw)
To: test-report
[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]
Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/83793
_apply issues_
Submitter: Chenxu Di <chenxux.di@intel.com>
Date: 2020-11-06 06:47:15
Reply_mail: 20201106064715.72714-1-chenxux.di@intel.com
DPDK git baseline:
Repo:dpdk-next-net-intel, CommitID: 790f5c585f1181a8b3b0788ded90d02a49a6589d
Repo:dpdk, CommitID: 60af9bd63dd46ebd709371e88b4096fd2bc048cf
* Repo: dpdk-next-net-intel
Auto-merging drivers/net/i40e/i40e_fdir.c
CONFLICT (content): Merge conflict in drivers/net/i40e/i40e_fdir.c
Auto-merging drivers/net/i40e/i40e_ethdev.h
error: Failed to merge in the changes.
Patch failed at 0001 net/i40e: fix incorrect FDIR flex configuration
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 drivers/net/i40e/i40e_fdir.c
CONFLICT (content): Merge conflict in drivers/net/i40e/i40e_fdir.c
Auto-merging drivers/net/i40e/i40e_ethdev.h
error: Failed to merge in the changes.
Patch failed at 0001 net/i40e: fix incorrect FDIR flex configuration
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] only message in thread
only message in thread, other threads:[~2020-11-06 9:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06 9:38 [dpdk-test-report] |FAILURE| pw(83793) [v2] net/i40e: fix incorrect FDIR flex configuration 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).