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

_apply issues_

Submitter: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: 2020-08-13 09:21:16
Reply_mail: 1597310476-11293-6-git-send-email-juraj.linkes@pantheon.tech

DPDK git baseline:
	Repo:dpdk, CommitID: b9b10ddb4292f2bc5524ae9f427a2795514eff02


* Repo: dpdk
Falling back to patching base and 3-way merge...
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
error: Failed to merge in the changes.
Patch failed at 0004 ci: add aarch64 -> aarch32 cross compiling jobs
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