[dpdk-test-report] |FAILURE| pw(75819) [v8, 3/3] ethdev: add common stats for telemetry

[dpdk-test-report] |FAILURE| pw(75819) [v8, 3/3] ethdev: add common stats for telemetry

[sys_stv]

[-- Attachment #1: Type: text/plain, Size: 2148 bytes --]


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

_apply issues_

Submitter: Ciara Power <ciara.power@intel.com>
Date: 2020-08-21 12:51:15
Reply_mail: 20200821125115.52998-4-ciara.power@intel.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: 9e55be09541bcaa4ea79e2400411c355cb337cf7
	Repo:dpdk, CommitID: dc18be1d8b9666bd9cc3ab929d001b44e80bc61a


* Repo: dpdk-next-net
A	app/test/Makefile
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): app/test/Makefile deleted in HEAD and modified in test/test_telemetry_data: add unit tests for data to JSON. Version test/test_telemetry_data: add unit tests for data to JSON of app/test/Makefile left in tree.
error: Failed to merge in the changes.
Patch failed at 0002 test/test_telemetry_data: add unit tests for data to JSON
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
There were no changes in its public API since 19.11.
    It should be mature enough to remove its 'experimental' tag.
    RTE_BPF_XTYPE_NUM is also being dropped from rte_bpf_xtype to
    avoid possible ABI problems in the future.
    
    Signed-off-by: Conor Walsh <conor.walsh@intel.com>
    Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
--
A	app/test/Makefile
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): app/test/Makefile deleted in HEAD and modified in test/test_telemetry_data: add unit tests for data to JSON. Version test/test_telemetry_data: add unit tests for data to JSON of app/test/Makefile left in tree.
error: Failed to merge in the changes.
Patch failed at 0002 test/test_telemetry_data: add unit tests for data to JSON
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