[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning

[Patchwork]

== Series Details ==

Series: drm/i915: Avoid enum conversion warning
URL   : https://patchwork.freedesktop.org/series/34269/
State : failure

== Summary ==

Applying: drm/i915: Avoid enum conversion warning
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_ddi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
Patch failed at 0001 drm/i915: Avoid enum conversion warning

Current HEAD:
commit 9d399f81694538228a539de9a908cdf9ef00f814
Author: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Date:   Thu Nov 23 12:29:07 2017 +0000

    drm-tip: 2017y-11m-23d-12h-28m-12s UTC integration manifest