[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/8] i915/gem_eio: Check that context create fails when wedged (rev2)

Patchwork
2019-02-19T17:36:40Z

== Series Details ==

Series: series starting with [i-g-t,1/8] i915/gem_eio: Check that context create fails when wedged (rev2)
URL : https://patchwork.freedesktop.org/series/56807/
State : failure

== Summary ==

Applying: i915/gem_eio: Check that context create fails when wedged
Applying: i915/gem_eio: Check we only ban the context
Applying: lib: Restore the i915.reset modparam before cleaning up
Applying: i915/gem_create: Verify that all new objects are clear
Using index info to reconstruct a base tree...
M tests/i915/gem_create.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_create.c
CONFLICT (content): Merge conflict in tests/i915/gem_create.c
Patch failed at 0004 i915/gem_create: Verify that all new objects are clear
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".