[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/skl: SKL CDCLK change on modeset tracking VCO (rev9)

[Patchwork]

== Series Details ==

Series: drm/i915/skl: SKL CDCLK change on modeset tracking VCO (rev9)
URL   : https://patchwork.freedesktop.org/series/1609/
State : failure

== Summary ==

Series 1609v9 drm/i915/skl: SKL CDCLK change on modeset tracking VCO
2016-03-10T21:31:49.256426 http://patchwork.freedesktop.org/api/1.0/series/1609/revisions/9/mbox/
Applying: drm/i915/skl: SKL CDCLK change on modeset tracking VCO
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/intel_ddi.c
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_dp.c
M	drivers/gpu/drm/i915/intel_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Patch failed at 0001 drm/i915/skl: SKL CDCLK change on modeset tracking VCO