✗ Fi.CI.BUILD: failure for HDR aux backlight range calculation

Patchwork patchwork at emeril.freedesktop.org
Mon Apr 25 17:49:33 UTC 2022


== Series Details ==

Series: HDR aux backlight range calculation
URL   : https://patchwork.freedesktop.org/series/103045/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/103045/revisions/1/mbox/ not applied
Applying: drm: New function to get luminance range based on static hdr metadata
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_edid.c
M	include/drm/drm_edid.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_edid.h
CONFLICT (content): Merge conflict in include/drm/drm_edid.h
Auto-merging drivers/gpu/drm/drm_edid.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm: New function to get luminance range based on static hdr metadata
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".




More information about the Intel-gfx-trybot mailing list