== Series Details == Series: series starting with [1/3] drm/i915: Make pipe/transcoder offsets not depend on enum values (rev4) URL : https://patchwork.freedesktop.org/series/52693/ State : failure
== Summary == Applying: drm/i915: Make pipe/transcoder offsets not depend on enum values Applying: drm/i915: Add code comment on assumption of pipe==transcoder Applying: drm/i915: Add code comment on assumption of pipe==transcoder Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_display.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h error: Failed to merge in the changes. Patch failed at 0003 drm/i915: Add code comment on assumption of pipe==transcoder Use 'git am --show-current-patch' to see the failed patch 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
