Test-Label: Intel-dts-test
Test-Status: FAILURE
http://dpdk.org/patch/98872
Subject: test_plans/kernelpf_iavf: complete mac filter case

_Apply issues_

Diff:
	test_plans/kernelpf_iavf_test_plan.rst

DPDK:
	commit 1c91ed5cdde164ca319c2c3b0ba5b4643db8e614
	Author: Asaf Penso <asafp@nvidia.com>
	Date:   Tue Sep 14 09:56:04 2021 +0200
	Comment: doc: add release milestones definition

DTS:
	commit d0f6a0f435e6a854e7ed45f729f838384ac3b4f4
	Author: Owen Hilyard <ohilyard@iol.unh.edu>
	Date:   Mon Aug 23 15:02:09 2021 -0400
	Comment: framework/flow: Update rteflow for new scapy versions

DTS git baseline:
	Repo:dts, CommitID: d0f6a0f435e6a854e7ed45f729f838384ac3b4f4



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging test_plans/kernelpf_iavf_test_plan.rst
CONFLICT (content): Merge conflict in test_plans/kernelpf_iavf_test_plan.rst
error: Failed to merge in the changes.
Patch failed at 0001 test_plans/kernelpf_iavf: complete mac filter case
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