[igt-dev] ✗ Fi.CI.BAT: failure for Upgrading the Engine discovery (rev2)

Patchwork
2019-06-28T22:25:16Z

== Series Details ==

Series: Upgrading the Engine discovery (rev2)
URL : https://patchwork.freedesktop.org/series/62512/
State : failure

== Summary ==

Applying: test/i915: gem_bad_reloc: use the gem_engine_topology library
Applying: test/i915: gem_exec_async: use the gem_engine_topology library
Applying: test/i915: gem_exec_capture: use the gem_engine_topology library
Applying: test/i915: gem_exec_params: use the gem_engine_topology library
Applying: lib/i915: Helper func for engine class to exec_flag
Using index info to reconstruct a base tree...
M lib/i915/gem_engine_topology.c
M lib/i915/gem_engine_topology.h
Falling back to patching base and 3-way merge...
Auto-merging lib/i915/gem_engine_topology.h
CONFLICT (content): Merge conflict in lib/i915/gem_engine_topology.h
Auto-merging lib/i915/gem_engine_topology.c
CONFLICT (content): Merge conflict in lib/i915/gem_engine_topology.c
Patch failed at 0005 lib/i915: Helper func for engine class to exec_flag
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".