== Series Details == Series: prime doc polish and ... a few cleanups (rev7) URL : https://patchwork.freedesktop.org/series/62135/ State : failure == Summary == Applying: drm/todo: Update drm_gem_object_funcs todo even more Using index info to reconstruct a base tree... M Documentation/gpu/todo.rst Falling back to patching base and 3-way merge... Auto-merging Documentation/gpu/todo.rst CONFLICT (content): Merge conflict in Documentation/gpu/todo.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/todo: Update drm_gem_object_funcs todo even more 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
