[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/4] drm-tip: 2018y-07m-04d-20h-25m-35s UTC integration manifest

[Patchwork]

== Series Details ==

Series: series starting with [1/4] drm-tip: 2018y-07m-04d-20h-25m-35s UTC integration manifest
URL   : https://patchwork.freedesktop.org/series/45956/
State : failure

== Summary ==

Applying: drm-tip: 2018y-07m-04d-20h-25m-35s 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
error: Failed to merge in the changes.
Patch failed at 0001 drm-tip: 2018y-07m-04d-20h-25m-35s UTC integration manifest
Use 'git am --show-current-patch' to see the failed 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".