Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/111128
Subject: [V2,2/2] tests/vf_smoke modify ixgbe support vf jumbo verify.

_Apply issues_

Diff:
	tests/smoke_base.py
	tests/TestSuite_vf_smoke.py

DPDK:
	commit 68c050954ff393b894aa3672a5ef1a231597dab0
	Author: Shijith Thotton <sthotton@marvell.com>
	Date:   Mon May 16 21:52:29 2022 +0530
	Comment: event/cnxk: flush event queues over multiple pass

DTS:
	commit f8e47bcdc2991b040ef80dd65fc914df93158290
	Author: Lijuan Tu <lijuan.tu@intel.com>
	Date:   Wed May 18 22:09:13 2022 +0800
	Comment: format all codes with format.sh

DTS git baseline:
	Repo:dts, CommitID: f8e47bcdc2991b040ef80dd65fc914df93158290



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/smoke_base.py
CONFLICT (content): Merge conflict in tests/smoke_base.py
error: Failed to merge in the changes.
Patch failed at 0001 tests/smoke_base modify ixgbe support vf jumbo verify.
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