Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/77208 _apply issues_ Submitter: Bruce Richardson Date: 2020-09-10 16:47:16 Reply_mail: 20200910164716.1011901-4-bruce.richardson@intel.com DPDK git baseline: Repo:dpdk, CommitID: a4235b781f5d7a7bda204f24a9d048696a2a484e * Repo: dpdk Falling back to patching base and 3-way merge... Auto-merging drivers/raw/ioat/ioat_rawdev_test.c CONFLICT (content): Merge conflict in drivers/raw/ioat/ioat_rawdev_test.c error: Failed to merge in the changes. Patch failed at 0001 raw/ioat: support multiple devices being tested 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