== Series Details == Series: Display Global Histogram (rev12) URL : https://patchwork.freedesktop.org/series/135793/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/135793/revisions/12/mbox/ not applied Applying: drm: Define histogram structures exposed to user Applying: drm: Define ImageEnhancemenT LUT structures exposed to user Applying: drm/crtc: Expose API to create drm crtc property for histogram Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_crtc.c M include/drm/drm_crtc.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_crtc.h CONFLICT (content): Merge conflict in include/drm/drm_crtc.h Auto-merging drivers/gpu/drm/drm_crtc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/crtc: Expose API to create drm crtc property for histogram 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
