[Intel-gfx] ✗ Fi.CI.BAT: failure for HDCP2.2 Phase II (rev15)

[Patchwork]

== Series Details ==

Series: HDCP2.2 Phase II (rev15)
URL   : https://patchwork.freedesktop.org/series/57232/
State : failure

== Summary ==

Applying: drm: Add Content protection type property
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic_uapi.c
M	drivers/gpu/drm/drm_connector.c
M	drivers/gpu/drm/drm_hdcp.c
M	drivers/gpu/drm/i915/display/intel_hdcp.c
M	include/drm/drm_connector.h
M	include/drm/drm_hdcp.h
M	include/drm/drm_mode_config.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_hdcp.h
CONFLICT (content): Merge conflict in include/drm/drm_hdcp.h
Auto-merging include/drm/drm_connector.h
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c
Auto-merging drivers/gpu/drm/drm_hdcp.c
Auto-merging drivers/gpu/drm/drm_connector.c
Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm: Add Content protection type 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".