== Series Details == Series: i915: CAGF and RC6 changes for MTL (rev7) URL : https://patchwork.freedesktop.org/series/108156/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/108156/revisions/7/mbox/ not applied Applying: drm/i915: Use GEN12_RPSTAT register for GT freq Applying: drm/i915/mtl: Modify CAGF functions for MTL Applying: drm/i915/gt: Use RC6 residency types as arguments to residency functions Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_rc6.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rc6.h 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/gt: Use RC6 residency types as arguments to residency functions 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".
