[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/edid: info & modes parsing and drm_edid refactors (rev2)

[Patchwork]

== Series Details ==

Series: drm/edid: info & modes parsing and drm_edid refactors (rev2)
URL   : https://patchwork.freedesktop.org/series/112392/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/112392/revisions/2/mbox/ not applied
Applying: drm/edid: fix AVI infoframe aspect ratio handling
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_edid.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/drm_edid.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_edid.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/edid: fix AVI infoframe aspect ratio handling
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".