[Intel-gfx] ✗ Fi.CI.BAT: failure for Send a hotplug when edid changes (rev3)

[Patchwork]

== Series Details ==

Series: Send a hotplug when edid changes (rev3)
URL   : https://patchwork.freedesktop.org/series/62816/
State : failure

== Summary ==

Applying: drm: Add helper to compare edids.
Applying: drm: Introduce change counter to drm_connector
Applying: drm/i915: Send hotplug event if edid had changed.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dp.c
M	drivers/gpu/drm/i915/display/intel_hdmi.c
M	drivers/gpu/drm/i915/display/intel_hotplug.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hotplug.c
Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 drm/i915: Send hotplug event if edid had changed.
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".