== Series Details == Series: drm: Add privacy-screen class and connector properties URL : https://patchwork.freedesktop.org/series/79259/ State : failure
== Summary == Applying: drm/connector: Fix kerneldoc warning Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_connector.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_connector.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/connector: Fix kerneldoc warning 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
