== Series Details == Series: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ (rev3) URL : https://patchwork.freedesktop.org/series/63432/ State : failure == Summary == Applying: drm/i915: enum transcoder and pipe are moved into i915_drm.h Applying: misc/mei_hdcp: Adding the transcoder detail in payload input Applying: drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/display/intel_hdcp.c M drivers/gpu/drm/i915/display/intel_hdmi.c M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c 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/i915/display/intel_dp.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
