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 18ca4a4ec73a2e28df45a10543b7cdd45f2801dd
	Author: Raja Zidane <rzidane@nvidia.com>
	Date:   Thu May 12 12:17:11 2022 +0300
	Comment: net/mlx5: support ESP SPI match and RSS hash

DTS:
	commit eefae2ab56699ac21047d8d5e3d2df03208ff52d
	Author: Weiyuan Li <weiyuanx.li@intel.com>
	Date:   Fri May 13 17:13:09 2022 +0800
	Comment: tests/vf_smoke: modify ixgbe support vf jumbo verify.

DTS git baseline:
	Repo:dts, CommitID: eefae2ab56699ac21047d8d5e3d2df03208ff52d



* 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