[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/12] drm/arm: Don't set allow_fb_modifiers explicitly (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [01/12] drm/arm: Don't set allow_fb_modifiers explicitly (rev2)
URL   : https://patchwork.freedesktop.org/series/88999/
State : failure

== Summary ==

Applying: drm/arm: Don't set allow_fb_modifiers explicitly
Applying: drm/arm/malidp: Always list modifiers
Applying: drm/exynos: Don't set allow_fb_modifiers explicitly
Applying: drm/i915: Don't set allow_fb_modifiers explicitly
Applying: drm/imx: Don't set allow_fb_modifiers explicitly
Applying: drm/msm/dpu1: Don't set allow_fb_modifiers explicitly
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 drm/msm/dpu1: Don't set allow_fb_modifiers explicitly
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".