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

_apply issues_

Submitter: SteveX Yang <stevex.yang@intel.com>
Date: 2020-09-10 02:20:18
Reply_mail: 20200910022018.8955-1-stevex.yang@intel.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: e52bf4f910f7f7c7377a895cd37db743172bd191
	Repo:dpdk, CommitID: 25efc61539603dbe634cd1a5b84c956c55893e41


* Repo: dpdk-next-net
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
Applying: app/test-pmd: fix meson build failed when used latency stats lib
Using index info to reconstruct a base tree...
M	app/test-pmd/meson.build
Falling back to patching base and 3-way merge...
Auto-merging app/test-pmd/meson.build
CONFLICT (content): Merge conflict in app/test-pmd/meson.build
error: Failed to merge in the changes.
Patch failed at 0001 app/test-pmd: fix meson build failed when used latency stats lib
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
Starting new HTTP connection (1): proxy-shz.intel.com
Starting new HTTP connection (1): proxy-shz.intel.com
Applying: app/test-pmd: fix meson build failed when used latency stats lib
error: sha1 information is lacking or useless (app/test-pmd/meson.build).
error: could not build fake ancestor
Patch failed at 0001 app/test-pmd: fix meson build failed when used latency stats lib
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