== Series Details == Series: Some debugfs enhancements (rev5) URL : https://patchwork.freedesktop.org/series/70658/ State : failure == Summary == Applying: drm/i915/rps: Add frequency translation helpers Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_rps.c M drivers/gpu/drm/i915/gt/intel_rps.h M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_sysfs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_sysfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_sysfs.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c Auto-merging drivers/gpu/drm/i915/gt/intel_rps.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.h Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915/rps: Add frequency translation helpers 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
