[Intel-gfx] ✗ Fi.CI.BAT: failure for drm: minimize drmP.h dependencies

[Patchwork]

== Series Details ==

Series: drm: minimize drmP.h dependencies
URL   : https://patchwork.freedesktop.org/series/55776/
State : failure

== Summary ==

Applying: staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h
Applying: drm/i915: prepare for drmP.h removal from drm_modeset_helper.h
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/intel_atomic.c
M	drivers/gpu/drm/i915/intel_atomic_plane.c
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c
Auto-merging drivers/gpu/drm/i915/intel_atomic.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/i915: prepare for drmP.h removal from drm_modeset_helper.h
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".