== Series Details == Series: drm/fb-helper: Move modesetting code to drm_client (rev7) URL : https://patchwork.freedesktop.org/series/58597/ State : failure == Summary == Applying: drm/atomic: Move __drm_atomic_helper_disable_plane/set_config() Applying: drm/fb-helper: Remove drm_fb_helper_crtc Using index info to reconstruct a base tree... M drivers/gpu/drm/Makefile Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/fb-helper: Remove drm_fb_helper_crtc 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
