Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/108336
Subject: [V4] framework/*: Modified create_eal_parameters API to support flexibility

_Apply issues_

Diff:
	framework/pmd_output.py
	framework/exception.py
	framework/dut.py

DPDK:
	commit 305769000c40a4fdf1ed0cf24c157b447b91ea7d
	Author: Thomas Monjalon <thomas@monjalon.net>
	Date:   Sun Feb 27 21:52:48 2022 +0100
	Comment: version: 22.03-rc2

DTS:
	commit fb043ef7231bcd8910fa55b072e2900d5cf2b5b5
	Author: Weiyuan Li <weiyuanx.li@intel.com>
	Date:   Fri Feb 11 14:26:10 2022 +0800
	Comment: test_plans/userspace_ethtool:remove duplicate vlan test case.

DTS git baseline:
	Repo:dts, CommitID: fb043ef7231bcd8910fa55b072e2900d5cf2b5b5



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging framework/dut.py
CONFLICT (content): Merge conflict in framework/dut.py
error: Failed to merge in the changes.
Patch failed at 0001 framework/*: Modified create_eal_parameters API to support flexibility
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