✗ Ro.CI.BAT: failure for drm: make drm_get_format_name thread-safe

Patchwork
2016-08-15T05:33:36Z

== Series Details ==

Series: drm: make drm_get_format_name thread-safe
URL : https://patchwork.freedesktop.org/series/11069/
State : failure

== Summary ==

Applying: drm: make drm_get_format_name thread-safe
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_crtc.c
M drivers/gpu/drm/i915/i915_debugfs.c
M drivers/gpu/drm/i915/intel_atomic_plane.c
M drivers/gpu/drm/i915/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/drm_crtc.c
error: Failed to merge in the changes.
Patch failed at 0001 drm: make drm_get_format_name thread-safe
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".