[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/10] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU. (rev6)

[Patchwork]

== Series Details ==

Series: series starting with [01/10] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU. (rev6)
URL   : https://patchwork.freedesktop.org/series/36828/
State : failure

== Summary ==

Applying: drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.
Applying: drm/i915/cnl: Extend Wa 1178 to Aux F.
Applying: drm/i915/cnl: Fix _CNL_PORT_TX_DW2_LN0_F definition.
Applying: drm/i915: Fix DPLCLKA_CFGCR0 bits for Port F.
Applying: drm/i915/cnl: Add right GMBUS pin number for HDMI on Port F.
Applying: drm/i915: For HPD connected port use hpd_pin instead of port.
Applying: drm/i915/cnl: Add HPD support for Port F.
Applying: drm/i915/cnl: Enable DDI-F on Cannonlake.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_reg.h
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_display.h
M	drivers/gpu/drm/i915/intel_runtime_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_display.h
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Patch failed at 0008 drm/i915/cnl: Enable DDI-F on Cannonlake.
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".