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

_apply issues_

Submitter: Zhike Wang <wangzhike@jd.com>
Date: 2020-07-03 06:47:22
Reply_mail: 1593758842-6306-1-git-send-email-wangzhike@jd.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 4a4df7dff05ea7b9df0527de3140823edd856ba1
	Repo:dpdk, CommitID: fea5a82f5643901f8259bb1250acf53d6be4b9cb


* Repo: dpdk-next-net
Auto-merging drivers/net/pcap/rte_eth_pcap.c
CONFLICT (content): Merge conflict in drivers/net/pcap/rte_eth_pcap.c
error: Failed to merge in the changes.
Patch failed at 0001 net/pcap: support snaplen option to truncate packet
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/pcap/rte_eth_pcap.c
CONFLICT (content): Merge conflict in drivers/net/pcap/rte_eth_pcap.c
error: Failed to merge in the changes.
Patch failed at 0001 net/pcap: support snaplen option to truncate packet
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