[igt-dev] ✗ Fi.CI.BAT: failure for new engine discovery interface (rev4)

Patchwork
2018-12-14T15:50:36Z

== Series Details ==

Series: new engine discovery interface (rev4)
URL : https://patchwork.freedesktop.org/series/52699/
State : failure

== Summary ==

Applying: include/drm-uapi: import i915_drm.h header file
Using index info to reconstruct a base tree...
M include/drm-uapi/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm-uapi/i915_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/i915_drm.h
Patch failed at 0001 include/drm-uapi: import i915_drm.h header file
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".