✗ Fi.CI.BAT: failure for series starting with [01/18] drm/i915: Swap magics and use SZ_1M

[Patchwork]

== Series Details ==

Series: series starting with [01/18] drm/i915: Swap magics and use SZ_1M
URL   : https://patchwork.freedesktop.org/series/44281/
State : failure

== Summary ==

Applying: drm/i915: Swap magics and use SZ_1M
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/gtt: Teach restore-gtt to walk the ggtt vma list not the object list
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_gtt.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/ringbuffer: Make context pin/unpin symmetric
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_ringbuffer.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Patch failed at 0003 drm/i915/ringbuffer: Make context pin/unpin symmetric
The copy of the patch that failed is found in: .git/rebase-apply/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".