Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/91679

_apply issues_

Submitter: Bing Zhao <bingz@nvidia.com>
Date: 2021-04-16 17:54:09
Reply_mail: 1618595649-157464-4-git-send-email-bingz@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 8b1e6d9eb25cbd86a0ad9b990eaf598dc9f5a15a
	Repo:dpdk, CommitID: 2414ce9b7b1770be2a5f406a1862589ebdef0315


* Repo: dpdk-next-net
This will be required in git-pw 2.0
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
error: patch failed: lib/librte_ethdev/rte_flow.c:186
error: lib/librte_ethdev/rte_flow.c: patch does not apply
error: patch failed: lib/librte_ethdev/rte_flow.h:2277
error: lib/librte_ethdev/rte_flow.h: patch does not apply
Applying: ethdev: introduce conntrack flow action and item
Patch failed at 0001 ethdev: introduce conntrack flow action and item
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
This will be required in git-pw 2.0
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
error: patch failed: lib/librte_ethdev/rte_flow.c:186
error: lib/librte_ethdev/rte_flow.c: patch does not apply
error: patch failed: lib/librte_ethdev/rte_flow.h:2277
error: lib/librte_ethdev/rte_flow.h: patch does not apply
Applying: ethdev: introduce conntrack flow action and item
Patch failed at 0001 ethdev: introduce conntrack flow action and item
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