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

[Patchwork]

== Series Details ==

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

== Summary ==

Applying: tests/i915: Drop gem_ctx_ringsize
Using index info to reconstruct a base tree...
A	tests/i915/gem_ctx_ringsize.c
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
No changes -- Patch already applied.
Applying: tests/i915/gem_exec_balancer: Drop the ringsize subtest
Using index info to reconstruct a base tree...
M	tests/i915/gem_exec_balancer.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_exec_balancer.c
No changes -- Patch already applied.
Applying: tests/i915/gem_exec_endless: Stop setting the ring size
Using index info to reconstruct a base tree...
M	tests/i915/gem_exec_endless.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/i915/gem_ctx_param: Drop the zeromap subtests
Using index info to reconstruct a base tree...
M	tests/i915/gem_ctx_param.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/i915: Drop gem_ctx_clone
Using index info to reconstruct a base tree...
A	tests/i915/gem_ctx_clone.c
M	tests/meson.build
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: docs: Add gem_engine_topology.h to the docs
Using index info to reconstruct a base tree...
M	docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
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
Auto-merging docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
Patch failed at 0006 docs: Add gem_engine_topology.h to the docs
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".