== Series Details == Series: Display experiment + GuC Display Metrics URL : https://patchwork.freedesktop.org/series/130437/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/130437/revisions/1/mbox/ not applied Applying: drm/i915/display: Introduce intel_display_guc_metrics Applying: drm/i915: Add experimental GuC SLPC display metrics Applying: drm/xe: Add GuC SLPC Display Metrics Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/xe_gt_debugfs.c M drivers/gpu/drm/xe/xe_guc_pc.c M drivers/gpu/drm/xe/xe_guc_pc.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_guc_pc.h Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c Auto-merging drivers/gpu/drm/xe/xe_gt_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 drm/xe: Add GuC SLPC Display Metrics 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
