✗ Fi.CI.BUILD: failure for series starting with [01/12] drm/i915: Remove unused bits of i915_vma/active api

[Patchwork]

== Series Details ==

Series: series starting with [01/12] drm/i915: Remove unused bits of i915_vma/active api
URL   : https://patchwork.freedesktop.org/series/93117/
State : failure

== Summary ==

Applying: drm/i915: Remove unused bits of i915_vma/active api
Applying: drm/i915: Slightly rework EXEC_OBJECT_CAPTURE handling
Applying: drm/i915: Remove gen6_ppgtt_unpin_all
Applying: drm/i915: Create a dummy object for gen6 ppgtt
Applying: drm/i915: Create a full object for mock_ring
Applying: drm/i915: vma is always backed by an object.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_context.c
M	drivers/gpu/drm/i915/gt/intel_ring_submission.c
M	drivers/gpu/drm/i915/i915_vma.c
M	drivers/gpu/drm/i915/i915_vma.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_vma.h
Auto-merging drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c
Auto-merging drivers/gpu/drm/i915/gt/intel_context.c
Applying: drm/i915: Fix runtime pm handling in i915_gem_shrink
Applying: drm/i915: Change shrink ordering to use locking around unbinding.
Applying: Move CONTEXT_VALID_BIT check
Applying: drm/i915: Remove resv from i915_vma
Applying: drm/i915: Remove pages_mutex and intel_gtt->vma_ops.set/clear_pages members
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/i915_vma.c
M	drivers/gpu/drm/i915/i915_vma.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_vma.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.h
Auto-merging drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Patch failed at 0011 drm/i915: Remove pages_mutex and intel_gtt->vma_ops.set/clear_pages members
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".