On Wed, Dec 6, 2017 at 7:08 PM, Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> wrote: > == Series Details == > > Series: drm/i915: Implement HDCP (rev4) > URL : https://patchwork.freedesktop.org/series/34671/ > State : failure > Ah, son of a beesting! I'll rebase on -tip and resend once people have time to provide feedback. Sean > == Summary == > > Applying: drm: Fix link-status kerneldoc line lengths > error: Failed to merge in the changes. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/drm_connector.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/drm_connector.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c > Patch failed at 0001 drm: Fix link-status kerneldoc line lengths > 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
