== Series Details == Series: series starting with [01/10] drm/i915: refactor ddi translations into a separate file (v2) URL : https://patchwork.freedesktop.org/series/86157/ State : failure == Summary == Applying: drm/i915: refactor ddi translations into a separate file (v2) Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/display/intel_ddi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c Auto-merging drivers/gpu/drm/i915/Makefile Applying: drm/i915: migrate hsw fdi code to new file. Applying: drm/i915: migrate skl planes code new file (v4) .git/rebase-apply/patch:5048: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/display/intel_ddi.c M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/display/intel_display.h M drivers/gpu/drm/i915/display/intel_display_types.h M drivers/gpu/drm/i915/display/intel_psr.c M drivers/gpu/drm/i915/display/intel_sprite.c M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_sprite.c Auto-merging drivers/gpu/drm/i915/display/intel_psr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c Auto-merging drivers/gpu/drm/i915/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915: migrate skl planes code new file (v4) 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
