[Intel-gfx] ✗ Ro.CI.BAT: failure for drm/core: Change declaration for gamma_set.

[Patchwork]

== Series Details ==

Series: drm/core: Change declaration for gamma_set.
URL   : https://patchwork.freedesktop.org/series/8332/
State : failure

== Summary ==

Applying: drm/core: Change declaration for gamma_set.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic_helper.c
M	drivers/gpu/drm/drm_crtc.c
M	drivers/gpu/drm/mgag200/mgag200_mode.c
M	drivers/gpu/drm/vc4/vc4_crtc.c
M	include/drm/drm_atomic_helper.h
M	include/drm/drm_crtc.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_crtc.h
Auto-merging include/drm/drm_atomic_helper.h
Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c
Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c
Auto-merging drivers/gpu/drm/drm_crtc.c
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.
Patch failed at 0001 drm/core: Change declaration for gamma_set.
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".