== Series Details == Series: series starting with [1/2] drm/dp: add extended receiver capability field present bit (rev3) URL : https://patchwork.freedesktop.org/series/46743/ State : failure == Summary == Applying: drm/dp: add extended receiver capability field present bit Applying: drm/dp: add extended receiver capability field present bit Using index info to reconstruct a base tree... M include/drm/drm_dp_helper.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_dp_helper.h CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h error: Failed to merge in the changes. Patch failed at 0002 drm/dp: add extended receiver capability field present bit 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
