[igt-dev] ✗ Fi.CI.BUILD: failure for Stop depending on context mutation (rev11)

[Patchwork]

== Series Details ==

Series: Stop depending on context mutation (rev11)
URL   : https://patchwork.freedesktop.org/series/88986/
State : failure

== Summary ==

Applying: tests/i915/gem_exec_fence: Move the engine data into inter_engine_context (v3)
Applying: tests/i915/gem_exec_fence: Convert to intel_ctx_t
Applying: tests/i915/gem_shrink: Convert to intel_ctx_t (v3)
Using index info to reconstruct a base tree...
M	tests/i915/gem_exec_schedule.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_exec_schedule.c
CONFLICT (content): Merge conflict in tests/i915/gem_exec_schedule.c
Patch failed at 0003 tests/i915/gem_shrink: Convert to intel_ctx_t (v3)
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".