✗ Fi.CI.BUILD: failure for hdrtest: hide the disgusting turds
Patchwork
patchwork at emeril.freedesktop.org
Tue Apr 1 12:59:32 UTC 2025
== Series Details ==
Series: hdrtest: hide the disgusting turds
URL : https://patchwork.freedesktop.org/series/147058/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/147058/revisions/1/mbox/ not applied
Applying: drm: place header test files in .hdrtest subdirectories
Applying: drm/xe: place header test files in .hdrtest subdirectories
Applying: drm/i915: place header test files in .hdrtest subdirectories
Applying: kbuild: hdrtest: place header test files in .hdrtest subdirectories
Applying: drm: add config option for extra build-time checks
Using index info to reconstruct a base tree...
M drivers/gpu/drm/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 drm: add config option for extra build-time checks
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
More information about the Intel-gfx
mailing list