✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/selftests: Fix up igt_reset_engine
patchwork at emeril.freedesktop.org
Mon Dec 18 22:25:14 UTC 2017
== Series Details ==
Series: series starting with [1/2] drm/i915/selftests: Fix up igt_reset_engine
URL : https://patchwork.freedesktop.org/series/35537/
State : failure
== Summary ==
Applying: drm/i915/selftests: Fix up igt_reset_engine
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Patch failed at 0001 drm/i915/selftests: Fix up igt_reset_engine
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 Intel-gfx-trybot