[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v3,1/3] drm/dp: DRM DP helper for reading Ignore MSA from DPCD

[Patchwork]

== Series Details ==

Series: series starting with [v3,1/3] drm/dp: DRM DP helper for reading Ignore MSA from DPCD
URL   : https://patchwork.freedesktop.org/series/75820/
State : failure

== Summary ==

Applying: drm/dp: DRM DP helper for reading Ignore MSA from DPCD
Applying: drm/i915/dp: Attach and set drm connector VRR property
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dp.c
M	drivers/gpu/drm/i915/display/intel_dp.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.h
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915/dp: Attach and set drm connector VRR property
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".