== Series Details == Series: Async flip optimization for DG2 (rev10) URL : https://patchwork.freedesktop.org/series/98981/ State : failure == Summary == Applying: drm/i915: Pass plane to watermark calculation functions Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_atomic_plane.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 Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.h No changes -- Patch already applied. Applying: drm/i915: Introduce do_async_flip flag to intel_plane_state Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_atomic_plane.c M drivers/gpu/drm/i915/display/intel_display.c M drivers/gpu/drm/i915/display/intel_display_types.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_atomic_plane.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915: Introduce do_async_flip flag to intel_plane_state 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".
