Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/73860 _apply issues_ Submitter: Somnath Kotur Date: 2020-07-13 05:17:59 Reply_mail: 20200713051759.18901-1-somnath.kotur@broadcom.com DPDK git baseline: Repo:dpdk-next-net-brcm, CommitID: 9e55be09541bcaa4ea79e2400411c355cb337cf7 Repo:dpdk, CommitID: dc18be1d8b9666bd9cc3ab929d001b44e80bc61a * Repo: dpdk-next-net-brcm Falling back to patching base and 3-way merge... Auto-merging drivers/net/bnxt/bnxt_txr.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c error: Failed to merge in the changes. Patch failed at 0001 net/bnxt: fix a segfault during Tx 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 There were no changes in its public API since 19.11. It should be mature enough to remove its 'experimental' tag. RTE_BPF_XTYPE_NUM is also being dropped from rte_bpf_xtype to avoid possible ABI problems in the future. Signed-off-by: Conor Walsh Acked-by: Konstantin Ananyev -- Falling back to patching base and 3-way merge... Auto-merging drivers/net/bnxt/bnxt_txr.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c error: Failed to merge in the changes. Patch failed at 0001 net/bnxt: fix a segfault during Tx 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