[igt-dev] ✗ Fi.CI.BUILD: failure for Fixes for i915_hangman and gem_exec_capture (rev7)

[Patchwork]

== Series Details ==

Series: Fixes for i915_hangman and gem_exec_capture (rev7)
URL   : https://patchwork.freedesktop.org/series/97981/
State : failure

== Summary ==

Applying: tests/i915/i915_hangman: Add descriptions
Applying: lib/hang: Fix igt_require_hang_ring to work with all engines
Applying: tests/i915/i915_hangman: Update capture test to use engine structure
Applying: tests/i915/i915_hangman: Explicitly test per engine reset vs full GPU reset
Applying: tests/i915/i915_hangman: Add uevent test & fix detector
Applying: tests/i915/i915_hangman: Use the correct context in hangcheck_unterminated
Applying: lib/store: Refactor common store code into helper function
Applying: tests/i915/i915_hangman: Add alive-ness test after error capture
Applying: tests/i915/i915_hangman: Remove reliance on context persistance
Applying: tests/i915/i915_hangman: Run background task on all engines
Applying: tests/i915/i915_hangman: Don't let background contexts cause a ban
Applying: tests/i915/gem_exec_fence: Configure correct context
Applying: lib/i915: Add helper for non-destructive engine property updates
Applying: tests/i915/i915_hangman: Configure engine properties for quicker hangs
Using index info to reconstruct a base tree...
M	tests/i915/i915_hangman.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/i915_hangman.c
CONFLICT (content): Merge conflict in tests/i915/i915_hangman.c
Patch failed at 0014 tests/i915/i915_hangman: Configure engine properties for quicker hangs
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".