== Series Details == Series: Refactor MST DSC Determination Policy URL : https://patchwork.freedesktop.org/series/140832/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/140832/revisions/1/mbox/ not applied Applying: drm/display/dsc: Refactor DRM MST DSC Determination Policy Applying: drm/display/dsc: MST DSC Interface Change Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/display/intel_dp_mst.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c Auto-merging drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c Auto-merging 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 0002 drm/display/dsc: MST DSC Interface Change 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". Build failed, no error log produced
