Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/104945
Subject: [v1] framework/packet: fix pylama errors

_Apply issues_

Diff:
	framework/packet.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 0dad4af293e3efbd6de001d9f5a717abb5edfe49
	Author: Lewei Yang <leweix.yang@intel.com>
	Date:   Wed Nov 24 17:23:43 2021 +0000
	Comment: tests/mtu_update:igc can receive packets 8 larger than MTU

DTS git baseline:
	Repo:dts, CommitID: 0dad4af293e3efbd6de001d9f5a717abb5edfe49



* Repo: dts
Falling back to patching base and 3-way merge...
Auto-merging framework/packet.py
CONFLICT (content): Merge conflict in framework/packet.py
error: Failed to merge in the changes.
Patch failed at 0001 framework/packet: fix pylama errors
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