== Series Details == Series: VRR capable attach prop in i915, VRR debugfs (rev3) URL : https://patchwork.freedesktop.org/series/78670/ State : failure == Summary == Applying: drm/i915/dp: Attach and set drm connector VRR property Applying: drm/debug: Expose connector VRR monitor range via debugfs Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_debugfs.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Revert "drm/amd/display: Expose connector VRR range via debugfs" Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 Revert "drm/amd/display: Expose connector VRR range via debugfs" 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
