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

_apply issues_

Submitter: Andrey Vesnovaty <andreyv@nvidia.com>
Date: 2020-10-14 11:40:15
Reply_mail: 20201014114015.17197-3-andreyv@nvidia.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: c96d67214afba1685abee7c13e34127724efaef2
	Repo:dpdk, CommitID: 99541c3028d741a09fe5dca95e79d8d020130173


* Repo: dpdk-next-net
Auto-merging doc/guides/rel_notes/release_20_11.rst
Auto-merging doc/guides/prog_guide/rte_flow.rst
CONFLICT (content): Merge conflict in doc/guides/prog_guide/rte_flow.rst
error: Failed to merge in the changes.
Patch failed at 0001 ethdev: add shared actions to flow API
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".

* Repo: dpdk
table: fix hash for 32-bit
    
    When create softnic hash table with 16 keys, it failed on 32-bit
    environment, because the pointer field in structure rte_bucket_4_16
    is only 32 bits. Add a padding field in 32-bit environment to keep
    the structure to a multiple of 64 bytes. Apply this to 8-byte and
--
Applying: ethdev: add shared actions to flow API
error: sha1 information is lacking or useless (doc/guides/rel_notes/release_20_11.rst).
error: could not build fake ancestor
Patch failed at 0001 ethdev: add shared actions to flow API
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