✗ Fi.CI.BUILD: failure for series starting with [01/16] drm-tip: 2021y-01m-18d-14h-24m-40s UTC integration manifest
Patchwork
patchwork at emeril.freedesktop.org
Mon Jan 18 23:58:11 UTC 2021
== Series Details ==
Series: series starting with [01/16] drm-tip: 2021y-01m-18d-14h-24m-40s UTC integration manifest
URL : https://patchwork.freedesktop.org/series/86013/
State : failure
== Summary ==
Applying: drm-tip: 2021y-01m-18d-14h-24m-40s 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
Patch failed at 0001 drm-tip: 2021y-01m-18d-14h-24m-40s 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".
More information about the Intel-gfx-trybot
mailing list