== Series Details == Series: series starting with [v2,rebased,01/11] drm: Add __drm_atomic_helper_crtc_state_reset() & co. (rev2) URL : https://patchwork.freedesktop.org/series/70775/ State : failure == Summary == Applying: drm: Add __drm_atomic_helper_crtc_state_reset() & co. Applying: drm/i915: s/intel_crtc/crtc/ in intel_crtc_init() Applying: drm/i915: Introduce intel_crtc_{alloc, free}() Applying: drm/i915: Introduce intel_crtc_state_reset() Applying: drm/i915: Introduce intel_plane_state_reset() Applying: drm/i915/display: Share intel_connector_needs_modeset() Applying: drm/i915/tgl: Select master transcoder for MST stream Applying: drm/i915/display: Always enables MST master pipe first Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0008 drm/i915/display: Always enables MST master pipe first 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
