✗ Fi.CI.BAT: failure for Aspect ratio support in DRM layer (rev4)

[Patchwork]

== Series Details ==

Series: Aspect ratio support in DRM layer (rev4)
URL   : https://patchwork.freedesktop.org/series/33983/
State : failure

== Summary ==

Applying: drm/modes: Introduce drm_mode_match()
Applying: drm/edid: Use drm_mode_match_no_clocks_no_stereo() for consistentcy
Applying: drm/edid: Fix cea mode aspect ratio handling
Applying: drm/edid: Don't send bogus aspect ratios in AVI infoframes
Applying: video/hdmi: Reject illegal picture aspect ratios
Applying: drm: Add DRM client cap for aspect-ratio
Applying: drm: Handle aspect-ratio info in getblob
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic.c
M	drivers/gpu/drm/drm_modes.c
M	drivers/gpu/drm/drm_property.c
M	include/drm/drm_property.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_property.h
Auto-merging drivers/gpu/drm/drm_property.c
Auto-merging drivers/gpu/drm/drm_modes.c
Auto-merging drivers/gpu/drm/drm_atomic.c
Applying: drm: Handle aspect ratio info in legacy and atomic modeset paths
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic.c
M	drivers/gpu/drm/drm_atomic_helper.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Auto-merging drivers/gpu/drm/drm_atomic.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_atomic.c
Patch failed at 0008 drm: Handle aspect ratio info in legacy and atomic modeset paths
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".