✗ Fi.CI.BUILD: failure for series starting with [TEST,v3,1/7] drm-tip: 2024y-09m-26d-07h-31m-35s UTC integration manifest

Patchwork patchwork at emeril.freedesktop.org
Thu Oct 3 08:40:58 UTC 2024


== Series Details ==

Series: series starting with [TEST,v3,1/7] drm-tip: 2024y-09m-26d-07h-31m-35s UTC integration manifest
URL   : https://patchwork.freedesktop.org/series/139475/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/139475/revisions/1/mbox/ not applied
Applying: drm-tip: 2024y-09m-26d-07h-31m-35s UTC integration manifest
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in integration-manifest
Auto-merging integration-manifest
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-tip: 2024y-09m-26d-07h-31m-35s UTC integration manifest
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-trybot mailing list