== Series Details == Series: drm/i915: Start reordering modeset clock calculations (rev6) URL : https://patchwork.freedesktop.org/series/101789/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/101789/revisions/6/mbox/ not applied Applying: drm/i915: Split shared dpll .get_dplls() into compute and get phases Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_dpll.c M drivers/gpu/drm/i915/display/intel_dpll_mgr.c M drivers/gpu/drm/i915/display/intel_dpll_mgr.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.h Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c Auto-merging drivers/gpu/drm/i915/display/intel_dpll.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll.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: Split shared dpll .get_dplls() into compute and get phases 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".
