✗ Ro.CI.BAT: failure for series starting with [1/9] drm/i915: Factor out i915_pvinfo.h

Patchwork patchwork at emeril.freedesktop.org
Sat Jun 18 06:35:39 UTC 2016


== Series Details ==

Series: series starting with [1/9] drm/i915: Factor out i915_pvinfo.h
URL   : https://patchwork.freedesktop.org/series/8859/
State : failure

== Summary ==

Applying: drm/i915: Factor out i915_pvinfo.h
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_vgpu.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_vgpu.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vgpu.h
Auto-merging drivers/gpu/drm/i915/i915_pvinfo.h
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/i915_pvinfo.h
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Factor out i915_pvinfo.h
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