✗ Fi.CI.BAT: failure for Split hw and drm state. (rev5)

Patchwork patchwork at emeril.freedesktop.org
Fri Jun 21 18:06:38 UTC 2019


== Series Details ==

Series: Split hw and drm state. (rev5)
URL   : https://patchwork.freedesktop.org/series/62319/
State : failure

== Summary ==

Applying: drm-tip: 2019y-06m-21d-09h-39m-52s 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: 2019y-06m-21d-09h-39m-52s 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