✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Mark up "sentinel" requests

[Patchwork]

== Series Details ==

Series: series starting with [1/3] drm/i915: Mark up "sentinel" requests
URL   : https://patchwork.freedesktop.org/series/64767/
State : failure

== Summary ==

Applying: drm/i915: Mark up "sentinel" requests
Applying: drm/i915/execlists: Cancel banned contexts on schedule-out
Applying: drm/i915: Cancel persistent contexts if !hangcheck
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile
Patch failed at 0003 drm/i915: Cancel persistent contexts if !hangcheck
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".