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

[Patchwork]

== Series Details ==

Series: new engine discovery interface
URL   : https://patchwork.freedesktop.org/series/58154/
State : failure

== Summary ==

Applying: lib/igt_gt: remove unnecessary argument
Applying: lib: ioctl_wrappers: reach engines by index as well
Applying: lib: move gem_context_has_engine from ioctl_wrappers to gem_context
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 0004 include/drm-uapi: import i915_drm.h header file
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".