== Series Details == Series: drm/i915: refactor intel display URL : https://patchwork.freedesktop.org/series/84998/ State : failure == Summary == Applying: drm/i915/display: move needs_modeset to an inline in header Applying: drm/i915/display: move to_intel_frontbuffer to header Applying: drm/i915/display: fix misused comma Applying: drm/i915: refactor cursor code out of i915_display.c Applying: drm/i915: refactor some crtc code out of intel display. 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=diff' to see the failed patch Patch failed at 0005 drm/i915: refactor some crtc code out of intel display. 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
