== Series Details == Series: drm: Try to fix encoder possible_clones/crtc (rev4) URL : https://patchwork.freedesktop.org/series/63399/ State : failure == Summary == Applying: drm: Include the encoder itself in possible_clones Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_crtc_internal.h M drivers/gpu/drm/drm_drv.c M drivers/gpu/drm/drm_mode_config.c M include/drm/drm_encoder.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_encoder.h CONFLICT (content): Merge conflict in include/drm/drm_encoder.h Auto-merging drivers/gpu/drm/drm_mode_config.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_mode_config.c Auto-merging drivers/gpu/drm/drm_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_drv.c Auto-merging drivers/gpu/drm/drm_crtc_internal.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm: Include the encoder itself in possible_clones 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
