✗ Fi.CI.BAT: failure for drm/i915/ehl: Add support for DPLL4 (v5)

Patchwork
2019-06-05T19:05:56Z

== Series Details ==

Series: drm/i915/ehl: Add support for DPLL4 (v5)
URL : https://patchwork.freedesktop.org/series/61684/
State : failure

== Summary ==

Applying: drm/i915/ehl: Add support for DPLL4 (v5)
.git/rebase-apply/patch:146: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_dpll_mgr.c
M drivers/gpu/drm/i915/intel_dpll_mgr.h
M drivers/gpu/drm/i915/intel_runtime_pm.c
M drivers/gpu/drm/i915/intel_runtime_pm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.h
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.h
Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/ehl: Add support for DPLL4 (v5)
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".