== Series Details == Series: drm/i915: Clean up the wm mem latency stuff (rev3) URL : https://patchwork.freedesktop.org/series/50802/ State : failure == Summary == Applying: drm/i915: Store all wm memory latency values in .1 usec units Applying: drm/i915: Use the spr/cur latencies on vlv/chv/g4x Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Applying: drm/i915: Eliminate skl_latency[] Applying: drm/i915: Add dev_priv->wm.num_levels and use it everywhere Applying: drm/i915: Add DEFINE_SNPRINTF_ARRAY() Applying: drm/i915: Make the WM memory latency print more compact Applying: drm/i915: Eliminate redundant ilk sprite/cursor wm fixup code Applying: drm/i915: Split skl+ and ilk+ read_wm_latency() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_pm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c error: Failed to merge in the changes. Patch failed at 0008 drm/i915: Split skl+ and ilk+ read_wm_latency() Use 'git am --show-current-patch' to see the failed patch 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
