[Intel-gfx] ✗ Fi.CI.BAT: failure for Workaround for MST displays failing to come back after resume

[Patchwork]

== Series Details ==

Series: Workaround for MST displays failing to come back after resume
URL   : https://patchwork.freedesktop.org/series/4371/
State : failure

== Summary ==

Series 4371v1 Workaround for MST displays failing to come back after resume
2016-03-11T15:36:12.937522 http://patchwork.freedesktop.org/api/1.0/series/4371/revisions/1/mbox/
Applying: drm/i915: Call intel_dp_mst_resume() before resuming displays
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Patch failed at 0001 drm/i915: Call intel_dp_mst_resume() before resuming displays