== Series Details ==

Series: drm: Improve logic behind damage handling (rev3)
URL   : https://patchwork.freedesktop.org/series/166107/
State : failure

== Summary ==

Error: patch 
https://patchwork.freedesktop.org/api/1.0/series/166107/revisions/3/mbox/ not 
applied
Applying: drm/damage-helper: Do not alter damage clips on modeset, but ignore 
them
Applying: drm/atomic-helpers: Evaluate plane damage after atomic_check
Applying: drm/ingenic: Remove calls to drm_atomic_helper_check_plane_damage()
Applying: drm/appletbdrm: Allocate request/response buffers in begin_fb_access
Applying: drm/atomic_helper: Do not evaluate plane damage before atomic_check
Applying: drm/damage-helper: Test src coord in 
drm_atomic_helper_check_plane_damage()
Applying: drm/damage-helper: Remove old state from 
drm_atomic_helper_damage_iter_init()
Using index info to reconstruct a base tree...
M       drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
CONFLICT (content): Merge conflict in 
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 drm/damage-helper: Remove old state from 
drm_atomic_helper_damage_iter_init()
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


Reply via email to