Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/79931 _apply issues_ Submitter: Bruce Richardson Date: 2020-10-07 16:30:23 Reply_mail: 20201007163023.2817-26-bruce.richardson@intel.com DPDK git baseline: Repo:dpdk, CommitID: 7cf3d07c3adcb015c303e4cdf2ef9712a65ce46d * Repo: dpdk Falling back to patching base and 3-way merge... Auto-merging drivers/raw/ioat/ioat_rawdev.c CONFLICT (content): Merge conflict in drivers/raw/ioat/ioat_rawdev.c error: Failed to merge in the changes. Patch failed at 0002 raw/ioat: fix missing close function 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