Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/72847 _apply issues_ Submitter: Thomas Monjalon Date: 2020-07-02 16:09:11 Reply_mail: 20200702160911.3596412-1-thomas@monjalon.net DPDK git baseline: Repo:dpdk, CommitID: 24cd1b529f35f106d323ebdd4df0203261824dcc * Repo: dpdk Auto-merging app/test/meson.build CONFLICT (content): Merge conflict in app/test/meson.build error: Failed to merge in the changes. Patch failed at 0001 build: remove special handling for node library 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