Test-Label: Intel-dts-suite-test
Test-Status: FAILURE
http://dpdk.org/patch/108528
Subject: [V1] framework/project_dpdk: change timeout of build dpdk

_Apply issues_

Diff:
	framework/project_dpdk.py

DPDK:
	commit 76076342ec8ef108a155938d46a88bb493fae60e
	Author: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
	Date:   Mon Apr 11 17:15:58 2022 +0200
	Comment: eal: emit warning for unused trylock return value

DTS:
	commit 24ae0a9a40dae26d27aa0ee79a75557135408add
	Author: Yaqi Tang <yaqi.tang@intel.com>
	Date:   Wed Apr 6 22:23:11 2022 +0800
	Comment: tests/cvl_iavf_fdir_pppol2tpoudp: modify test script for more fdir action

DTS git baseline:
	Repo:dts, CommitID: 24ae0a9a40dae26d27aa0ee79a75557135408add



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