== Series Details == Series: Add two-stage watermark programming for VLV/CHV (v4) URL : https://patchwork.freedesktop.org/series/9067/ State : failure == Summary == Applying: drm/i915: Remove unused parameters from intel_plane_wm_parameters Applying: drm/i915: Rename skl_plane_id to wm_plane_id 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 0002 drm/i915: Rename skl_plane_id to wm_plane_id The copy of the patch that failed is found in: .git/rebase-apply/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
