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

_apply issues_

Submitter: Sachin Saxena (OSS) <sachin.saxena@oss.nxp.com>
Date: 2020-09-28 10:54:28
Reply_mail: 20200928105428.14197-1-sachin.saxena@oss.nxp.com

DPDK git baseline:
	Repo:dpdk-next-net, CommitID: fc396e3ff5546c326212dea5625d7f1eb5fadd4b
	Repo:dpdk, CommitID: 77a8884c44c212d61bd3523b862dabdd30bbb00f


* Repo: dpdk-next-net
Applying: net/dpaa2: release port upon close
error: sha1 information is lacking or useless (drivers/net/dpaa2/dpaa2_ethdev.c).
error: could not build fake ancestor
Patch failed at 0001 net/dpaa2: release port upon close
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
exists. Then, it maps the second part, if it exists and "if mapping the
    first part succeeded".
    
    The recent change that replaces MAP_FAILED with NULL breaks the "if
    mapping the first part succeeded" condition (1) in the snippet below.
    
        void *map_addr = NULL;
--
        }
    
        if (map_addr == NULL) {
                RTE_LOG(ERR, EAL, "Failed to map pci BAR%d\n",
                        bar_index);
                return -1;
        }
--
    and the function fails. This behavior is a regression and fails
    probing hardware with vector table offset 0.
    
    Previously, (1) was "map_addr != MAP_FAILED", which meant
    pci_map_resource() was actually attempted and failed. So, expand (1)
    to check if the first part exists as well, to match the semantics of
    MAP_FAILED.
    
    Bugzilla ID: 539
    Fixes: e200535c1ca3 ("mem: drop mapping API workaround")
--
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/dpaa2/dpaa2_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/dpaa2/dpaa2_ethdev.c
error: Failed to merge in the changes.
Patch failed at 0001 net/dpaa2: release port upon close
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