== Series Details == Series: Fix cursor FB unpinning. (rev3) URL : https://patchwork.freedesktop.org/series/133896/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/133896/revisions/3/mbox/ not applied Applying: drm: Add drm_vblank_work_flush_all(). Applying: drm/i915: Use vblank worker to unpin old legacy cursor fb safely Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_cursor.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_cursor.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: Use vblank worker to unpin old legacy cursor fb safely 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". Build failed, no error log produced
