[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/fb-helper: Move modesetting code to drm_client

[Patchwork]

== Series Details ==

Series: drm/fb-helper: Move modesetting code to drm_client
URL   : https://patchwork.freedesktop.org/series/58597/
State : failure

== Summary ==

Applying: drm/fb-helper: Remove unused gamma_size variable
Applying: drm/fb-helper: dpms_legacy(): Only set on connectors in use
Applying: drm/atomic: Move __drm_atomic_helper_disable_plane/set_config()
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_atomic_helper.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/atomic: Move __drm_atomic_helper_disable_plane/set_config()
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".