✗ Ro.CI.BAT: failure for series starting with [01/28] drm/i915: Always mark the writer as also a read for busy ioctl

Patchwork patchwork at emeril.freedesktop.org
Thu Aug 11 05:43:34 UTC 2016


== Series Details ==

Series: series starting with [01/28] drm/i915: Always mark the writer as also a read for busy ioctl
URL   : https://patchwork.freedesktop.org/series/10893/
State : failure

== Summary ==

Applying: drm/i915: Always mark the writer as also a read for busy ioctl
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Move missed interrupt detection from hangcheck to breadcrumbs
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/i915_gem.c
M	drivers/gpu/drm/i915/i915_irq.c
M	drivers/gpu/drm/i915/intel_breadcrumbs.c
M	drivers/gpu/drm/i915/intel_engine_cs.c
M	drivers/gpu/drm/i915/intel_ringbuffer.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h
error: Failed to merge in the changes.
Patch failed at 0002 drm/i915: Move missed interrupt detection from hangcheck to breadcrumbs
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