✗ Fi.CI.BUILD: failure for series starting with [01/14] drm/i915: Rework watermark readout to use plane api (rev3)

Patchwork
2019-10-22T18:53:20Z

== Series Details ==

Series: series starting with [01/14] drm/i915: Rework watermark readout to use plane api (rev3)
URL : https://patchwork.freedesktop.org/series/68154/
State : failure

== Summary ==

Applying: drm/i915: Rework watermark readout to use plane api
Applying: drm/i915: Introduce intel_atomic_get_plane_state_after_check(), v2.
Applying: drm/i915: Handle a few more cases for crtc hw/uapi split, v2.
Applying: drm/i915: Add aliases for uapi and hw to crtc_state
Applying: drm/i915: Perform manual conversions for crtc uapi/hw split, v2.
Applying: drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_ddi.c
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/display/intel_dp.c
M drivers/gpu/drm/i915/display/intel_dp_mst.c
M drivers/gpu/drm/i915/display/intel_hdmi.c
M drivers/gpu/drm/i915/i915_debugfs.c
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0006 drm/i915: Perform automated conversions for crtc uapi/hw split, base -> hw.
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".