== Series Details == Series: HDCP1.4 fixes (rev2) URL : https://patchwork.freedesktop.org/series/38978/ State : failure == Summary == Applying: drm/i915: Read HDCP R0 thrice in case of mismatch Applying: drm/i915: read Vprime thrice incase of mismatch Applying: drm/i915: Check hdcp key loadability Applying: drm/i915: Poll hdcp register on sudden NACK Applying: drm/i915: Move hdcp msg detection into shim error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_dp.c M drivers/gpu/drm/i915/intel_hdcp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_hdcp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/intel_dp.c Patch failed at 0005 drm/i915: Move hdcp msg detection into shim The copy of the patch that failed is found in: .git/rebase-apply/patch 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
