✗ Fi.CI.BAT: failure for series starting with [01/28] drm/i915/execlists: Detect cross-contamination with GuC

[Patchwork]

== Series Details ==

Series: series starting with [01/28] drm/i915/execlists: Detect cross-contamination with GuC
URL   : https://patchwork.freedesktop.org/series/62304/
State : failure

== Summary ==

Applying: drm/i915/execlists: Detect cross-contamination with GuC
Applying: drm/i915: Keep engine alive as we retire the context
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_active.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Skip shrinking already freed pages
Applying: drm/i915: Stop passing I915_WAIT_LOCKED to i915_request_wait()
Applying: drm/i915: Flush the execution-callbacks on retiring
Applying: drm/i915/execlists: Preempt-to-busy
Applying: drm/i915/execlists: Minimalistic timeslicing
Applying: drm/i915/execlists: Force preemption
Applying: drm/i915: Make the semaphore saturation mask global
Applying: dma-fence: Propagate errors to dma-fence-array container
Applying: dma-fence: Report the composite sync_file status
Applying: dma-fence: Refactor signaling for manual invocation
Applying: dma-fence: Always execute signal callbacks
Applying: drm/i915: Track i915_active using debugobjects
Applying: drm/i915: Signal fence completion from i915_request_wait
Applying: drm/i915: Remove waiting & retiring from shrinker paths
Applying: drm/i915: Throw away the active object retirement complexity
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_object.c
M	drivers/gpu/drm/i915/gem/i915_gem_object.h
M	drivers/gpu/drm/i915/gem/i915_gem_object_types.h
M	drivers/gpu/drm/i915/i915_gem_batch_pool.c
M	drivers/gpu/drm/i915/i915_vma.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_vma.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/i915_gem_batch_pool.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_batch_pool.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c
Patch failed at 0017 drm/i915: Throw away the active object retirement complexity
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".