✗ Fi.CI.BAT: failure for series starting with [1/6] drm/i915: Stop kicking the signaling thread on seqno wraparound
Patchwork
patchwork at emeril.freedesktop.org
Wed Mar 7 13:07:57 UTC 2018
== Series Details ==
Series: series starting with [1/6] drm/i915: Stop kicking the signaling thread on seqno wraparound
URL : https://patchwork.freedesktop.org/series/39522/
State : failure
== Summary ==
Applying: drm/i915: Stop kicking the signaling thread on seqno wraparound
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_request.c
M drivers/gpu/drm/i915/intel_breadcrumbs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_breadcrumbs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c
Auto-merging drivers/gpu/drm/i915/i915_request.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c
Patch failed at 0001 drm/i915: Stop kicking the signaling thread on seqno wraparound
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