== Series Details == Series: Implement CMRR Support (rev12) URL : https://patchwork.freedesktop.org/series/126443/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/126443/revisions/12/mbox/ not applied Applying: drm/i915: Protect CRC reg macro arguments for consistency Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm-tip: 2024y-06m-05d-09h-52m-50s UTC integration manifest Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in integration-manifest Auto-merging integration-manifest 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-tip: 2024y-06m-05d-09h-52m-50s UTC integration manifest 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
