== Series Details == Series: more drm doc work (rev2) URL : https://patchwork.freedesktop.org/series/10844/ State : failure == Summary == Applying: drm/doc: Fix more kerneldoc/sphinx warnings Applying: drm/doc: Light drm-kms-helper.rst cleanup Applying: drm/kms-helpers: Extract drm_modeset_helper.[hc] Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_plane_helper.c M include/drm/drm_plane_helper.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_plane_helper.h CONFLICT (content): Merge conflict in include/drm/drm_plane_helper.h Auto-merging include/drm/drm_modeset_helper.h Auto-merging drivers/gpu/drm/drm_plane_helper.c Removing drivers/gpu/drm/drm_kms_helper.c error: Failed to merge in the changes. Patch failed at 0003 drm/kms-helpers: Extract drm_modeset_helper.[hc] 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
