✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/edid: convert DP, HDMI and LVDS to drm_edid

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915/edid: convert DP, HDMI and LVDS to drm_edid
URL   : https://patchwork.freedesktop.org/series/111836/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/111836/revisions/1/mbox/ not applied
Applying: drm/i915/edid: convert DP, HDMI and LVDS to drm_edid
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_connector.c
M	drivers/gpu/drm/i915/display/intel_display_types.h
M	drivers/gpu/drm/i915/display/intel_dp.c
M	drivers/gpu/drm/i915/display/intel_lvds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_connector.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/edid: convert DP, HDMI and LVDS to drm_edid
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".