[Intel-gfx] ✗ Fi.CI.BAT: failure for ICL PLLs, DP/HDMI and misc display (rev4)

[Patchwork]

== Series Details ==

Series: ICL PLLs, DP/HDMI and misc display (rev4)
URL   : https://patchwork.freedesktop.org/series/38737/
State : failure

== Summary ==

Applying: drm/i915/icl: add basic support for the ICL clocks
Applying: drm/i915/icl: add basic support for the ICL clocks
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/intel_ddi.c
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_dpll_mgr.c
M	drivers/gpu/drm/i915/intel_dpll_mgr.h
M	drivers/gpu/drm/i915/intel_drv.h
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_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
Patch failed at 0002 drm/i915/icl: add basic support for the ICL clocks
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".