[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: conversion to drm_device based logging macros.

[Patchwork]

== Series Details ==

Series: drm/i915: conversion to drm_device based logging macros.
URL   : https://patchwork.freedesktop.org/series/72959/
State : failure

== Summary ==

Applying: drm/i915/dp: convert to struct drm_device based logging macros.
Applying: drm/i915/dp_link_training: convert to drm_device based logging macros.
Applying: drm/i915/atomic: conversion to drm_device based logging macros.
Applying: drm/i915/color: conversion to drm_device based logging macros.
Applying: drm/i915/crt: automatic conversion to drm_device based logging macros.
Applying: drm/i915/dp_aux_backlight: convert to drm_device based logging macros.
Applying: drm/i915/dpll_mgr: convert to drm_device based logging macros.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dpll_mgr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0007 drm/i915/dpll_mgr: convert to drm_device based logging macros.
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".