Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/78112
Subject: tests/softnic: change for new DPDK API

_Apply issues_

Diff:
	tests/TestSuite_softnic.py

DPDK:
	commit 042f5a355a57b31a9f87824173a9d427b21abdb8
	Author: David Marchand <david.marchand@redhat.com>
	Date:   Thu Dec 2 19:11:21 2021 +0100
	Comment: version: 22.03-rc0

DTS:
	commit 5b1f1f829daad677af5b513b52e066b7d91e46ed
	Author: Lijuan Tu <lijuan.tu@intel.com>
	Date:   Wed Nov 3 01:27:02 2021 +0800
	Comment: version: 21.08.0

DTS git baseline:
	Repo:dts, CommitID: 5b1f1f829daad677af5b513b52e066b7d91e46ed



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/TestSuite_softnic.py
CONFLICT (content): Merge conflict in tests/TestSuite_softnic.py
error: Failed to merge in the changes.
Patch failed at 0001 tests/softnic: change for new DPDK API
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