✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915/lrc: Scrub the GPU state of the guilty hanging request

Patchwork patchwork at emeril.freedesktop.org
Mon Apr 30 14:57:07 UTC 2018


== Series Details ==

Series: series starting with [1/3] drm/i915/lrc: Scrub the GPU state of the guilty hanging request
URL   : https://patchwork.freedesktop.org/series/42426/
State : failure

== Summary ==

Applying: drm/i915/lrc: Scrub the GPU state of the guilty hanging request
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
Patch failed at 0001 drm/i915/lrc: Scrub the GPU state of the guilty hanging request
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 mailing list