Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/105232
Subject: [V2] tests/cvl_qinq: add test cases for cvl qinq switch filter support l4

_Apply issues_

Diff:
	tests/TestSuite_cvl_qinq.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 8b7a3a50e39c8194608d118a0069155d6d827ce1
	Author: Yan Xia <yanx.xia@intel.com>
	Date:   Fri Dec 10 11:33:36 2021 +0000
	Comment: test_plans: modify dpdk app/example to adapt meson name

DTS git baseline:
	Repo:dts, CommitID: 8b7a3a50e39c8194608d118a0069155d6d827ce1



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging tests/TestSuite_cvl_qinq.py
CONFLICT (content): Merge conflict in tests/TestSuite_cvl_qinq.py
error: Failed to merge in the changes.
Patch failed at 0001 tests/cvl_qinq: add test cases for cvl qinq switch filter support l4
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