[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/2] lib/i915: Allow writing of engine properties

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] lib/i915: Allow writing of engine properties
URL   : https://patchwork.freedesktop.org/series/74696/
State : failure

== Summary ==

Applying: lib/i915: Allow writing of engine properties
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
Auto-merging lib/i915/gem_engine_topology.c
No changes -- Patch already applied.
Applying: i915/gem_ctx_persistence: Tune reset-timeout
Using index info to reconstruct a base tree...
M	tests/i915/gem_ctx_persistence.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_ctx_persistence.c
CONFLICT (content): Merge conflict in tests/i915/gem_ctx_persistence.c
Patch failed at 0002 i915/gem_ctx_persistence: Tune reset-timeout
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".