== Series Details == Series: More watermarks improvements (rev2) URL : https://patchwork.freedesktop.org/series/51086/ State : failure == Summary == Applying: drm/i915: don't apply Display WAs 1125 and 1126 to GLK/CNL+ Applying: drm/i915: remove padding from struct skl_wm_level Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: fix handling of invisible planes in watermarks code Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h 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 Auto-merging drivers/gpu/drm/i915/i915_drv.h error: Failed to merge in the changes. Patch failed at 0003 drm/i915: fix handling of invisible planes in watermarks code 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
