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

_apply issues_

Submitter: Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>
Date: 2020-08-13 23:21:45
Reply_mail: 1597360905-74106-23-git-send-email-navasile@linux.microsoft.com

DPDK git baseline:
	Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02


* Repo: dpdk
CONFLICT (content): Merge conflict in .gitignore
Auto-merging .gitattributes
CONFLICT (add/add): Merge conflict in .gitattributes
error: Failed to merge in the changes.
Patch failed at 0013 Update .gitignore and create .gitattributes
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