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 e4e983b975df700474309605b6adb5f2c6d83e2f
	Author: Tyler Retzlaff <roretzla@linux.microsoft.com>
	Date:   Wed Mar 9 23:35:08 2022 -0800
	Comment: eal/windows: fix data race when creating threads

DTS:
	commit 4efb50ddea4010c45976b9f8358b7f4dd77623f6
	Author: Jiale Song <songx.jiale@intel.com>
	Date:   Thu Mar 31 12:43:20 2022 +0000
	Comment: tests/distributor: remove dpdk modification

DTS git baseline:
	Repo:dts, CommitID: 4efb50ddea4010c45976b9f8358b7f4dd77623f6



* 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