[igt-dev] ✗ Fi.CI.BAT: failure for lib: Run gem_test_engine() in an isolated context

Patchwork patchwork at emeril.freedesktop.org
Thu Mar 22 17:35:33 UTC 2018


== Series Details ==

Series: lib: Run gem_test_engine() in an isolated context
URL   : https://patchwork.freedesktop.org/series/40465/
State : failure

== Summary ==

Applying: lib: Run gem_test_engine() in an isolated context
Using index info to reconstruct a base tree...
M	lib/i915/gem_submission.c
Falling back to patching base and 3-way merge...
Auto-merging lib/i915/gem_submission.c
CONFLICT (content): Merge conflict in lib/i915/gem_submission.c
Patch failed at 0001 lib: Run gem_test_engine() in an isolated context
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".



More information about the igt-dev mailing list