== Series Details == Series: Forward Error Correction URL : https://patchwork.freedesktop.org/series/47848/ State : failure == Summary == Applying: drm/dp/fec: DRM helper for Forward Error Correction Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_dp_helper.c M include/drm/drm_dp_helper.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_dp_helper.h Auto-merging drivers/gpu/drm/drm_dp_helper.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c error: Failed to merge in the changes. Patch failed at 0001 drm/dp/fec: DRM helper for Forward Error Correction 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
