== Series Details == Series: drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev7) URL : https://patchwork.freedesktop.org/series/94712/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/94712/revisions/7/mbox/ not applied Applying: drm/hdcp: Add drm_hdcp_atomic_check() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_atomic.c M drivers/gpu/drm/i915/display/intel_hdcp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/display/intel_atomic.c Applying: drm/hdcp: Avoid changing crtc state in hdcp atomic check Applying: drm/hdcp: Update property value on content type and user changes Applying: drm/hdcp: Expand HDCP helper library for enable/disable/check Applying: drm/i915/hdcp: Consolidate HDCP setup/state cache Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_hdcp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0005 drm/i915/hdcp: Consolidate HDCP setup/state cache 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". Build failed, no error log produced
