✗ Fi.CI.BAT: failure for series starting with [1/8] drm-tip: 2018y-05m-23d-12h-29m-52s UTC integration manifest
Patchwork
patchwork at emeril.freedesktop.org
Wed May 23 19:10:46 UTC 2018
== Series Details ==
Series: series starting with [1/8] drm-tip: 2018y-05m-23d-12h-29m-52s UTC integration manifest
URL : https://patchwork.freedesktop.org/series/43642/
State : failure
== Summary ==
Applying: drm-tip: 2018y-05m-23d-12h-29m-52s UTC integration manifest
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging integration-manifest
CONFLICT (add/add): Merge conflict in integration-manifest
Patch failed at 0001 drm-tip: 2018y-05m-23d-12h-29m-52s UTC integration manifest
The copy of the patch that failed is found in: .git/rebase-apply/patch
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