[igt-dev] ✗ Fi.CI.BUILD: failure for Adjust IGT for upstream API clean-ups (rev2)

[Patchwork]

== Series Details ==

Series: Adjust IGT for upstream API clean-ups (rev2)
URL   : https://patchwork.freedesktop.org/series/88194/
State : failure

== Summary ==

Applying: tests/i915: Drop gem_ctx_ringsize
Applying: tests/i915/gem_exec_balancer: Drop the ringsize subtest
Applying: tests/i915/gem_exec_endless: Stop setting the ring size
Applying: tests/i915/gem_ctx_param: Drop the zeromap subtests
Applying: tests/i915: Drop gem_ctx_clone
Applying: tests/i915/gem_ctx_create: Stop cloning engines
Applying: tests/i915/gem_ctx_persistence: Drop the clone test
Applying: lib/i915/gem_context: Implement VM and engine cloning manually
Applying: lib/i915/gem_context: Implement VM and engine cloning manually (v3)
Using index info to reconstruct a base tree...
M	lib/i915/gem_context.c
M	lib/i915/gem_context.h
M	tests/i915/gem_ctx_shared.c
M	tests/i915/gem_exec_balancer.c
M	tests/i915/gem_exec_schedule.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_exec_balancer.c
Auto-merging lib/i915/gem_context.h
Auto-merging lib/i915/gem_context.c
CONFLICT (content): Merge conflict in lib/i915/gem_context.c
Patch failed at 0009 lib/i915/gem_context: Implement VM and engine cloning manually (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".