Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/75457

_apply issues_

Submitter: Thomas Monjalon <thomas@monjalon.net>
Date: 2020-08-12 09:29:15
Reply_mail: 20200812092915.2325511-1-thomas@monjalon.net

DPDK git baseline:
	Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/contributing/stable.rst
CONFLICT (content): Merge conflict in doc/guides/contributing/stable.rst
error: Failed to merge in the changes.
Patch failed at 0001 switch default git branch name to main
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