✗ Ro.CI.BAT: failure for trybot gen8 wm (rev4)

Patchwork patchwork at emeril.freedesktop.org
Mon May 23 10:22:21 UTC 2016

== Series Details ==

Series: trybot gen8 wm (rev4)
URL   : https://patchwork.freedesktop.org/series/7342/
State : failure

== Summary ==

Applying: trybot gen8 wm
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_drv.h
M	drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Patch failed at 0001 trybot gen8 wm
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