[igt-dev] ✗ Fi.CI.BUILD: failure for Test parallel execbuf

[Patchwork]

== Series Details ==

Series: Test parallel execbuf
URL   : https://patchwork.freedesktop.org/series/96823/
State : failure

== Summary ==

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