Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/103296
Subject: [V1] tests/userspace_ethtool:rename ETH to RTE_ETH

_Apply issues_

Diff:
	tests/TestSuite_userspace_ethtool.py
	test_plans/userspace_ethtool_test_plan.rst

DPDK:
	commit 312b94ef884f0cf4ee42dde36acf23a41172794d
	Author: Thomas Monjalon <thomas@monjalon.net>
	Date:   Wed Mar 9 00:34:09 2022 +0100
	Comment: version: 22.03-rc3

DTS:
	commit aacd2557165f98e6ba73ed29ec65283eb30a37bb
	Author: ChenYu Huang <chenyux.huang@intel.com>
	Date:   Tue Mar 8 17:23:39 2022 +0800
	Comment: framework/project_dpdk: change timeout of extract dpdk package and build dpdk

DTS git baseline:
	Repo:dts, CommitID: aacd2557165f98e6ba73ed29ec65283eb30a37bb



* Repo: dts
CONFLICT (content): Merge conflict in tests/TestSuite_userspace_ethtool.py
Auto-merging test_plans/userspace_ethtool_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/userspace_ethtool_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 tests/userspace_ethtool:rename ETH to RTE_ETH
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