== Series Details == Series: Add DSC PPS readout URL : https://patchwork.freedesktop.org/series/120456/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/120456/revisions/1/mbox/ not applied Applying: drm/i915/dsc: Add PPS enum Applying: drm/i915/vdsc: Add function to read any PPS register Applying: drm/i915/vdsc: Add function to write in PPS registers Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_vdsc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vdsc.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 drm/i915/vdsc: Add function to write in PPS registers 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
