== Series Details == Series: drm/i915/guc/slpc: Allow SLPC to use efficient frequency (rev6) URL : https://patchwork.freedesktop.org/series/107101/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/107101/revisions/6/mbox/ not applied Applying: drm/i915/guc/slpc: Allow SLPC to use efficient frequency Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_rps.c M drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c M drivers/gpu/drm/i915/intel_mchbar_regs.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/guc/slpc: Allow SLPC to use efficient frequency 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".
