[Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [01/33] drm/i915: Add smp_rmb() to busy ioctl's RCU dance (rev4)

[Patchwork]

== Series Details ==

Series: series starting with [01/33] drm/i915: Add smp_rmb() to busy ioctl's RCU dance (rev4)
URL   : https://patchwork.freedesktop.org/series/10770/
State : failure

== Summary ==

Applying: drm/i915: Add smp_rmb() to busy ioctl's RCU dance
Applying: drm/i915: Do not overwrite the request with zero on reallocation
Applying: drm/i915: Move missed interrupt detection from hangcheck to breadcrumbs
Applying: drm/i915: Use RCU to annotate and enforce protection for breadcrumb's bh
Applying: drm/i915: Reduce amount of duplicate buffer information captured on error
Applying: drm/i915: Stop the machine whilst capturing the GPU crash dump
Applying: drm/i915: Store the active context object on all engines upon error
Applying: drm/i915: Move setting of request->batch into its single callsite
Applying: drm/i915: Mark unmappable GGTT entries as PIN_HIGH
Applying: drm/i915: Remove inactive/active list from debugfs
Applying: drm/i915: Focus debugfs/i915_gem_pinned to show only display pins
Applying: drm/i915: Reduce i915_gem_objects to only show object information
Applying: drm/i915: Remove redundant WARN_ON from __i915_add_request()
Applying: drm/i915: Create a VMA for an object
Applying: drm/i915: Track pinned vma inside guc
Applying: drm/i915: Convert fence computations to use vma directly
Applying: drm/i915: Use VMA directly for checking tiling parameters
Applying: drm/i915: Use VMA as the primary object for context state
Applying: drm/i915: Only clflush the context object when binding
Applying: drm/i915: Use VMA for ringbuffer tracking
Applying: drm/i915: Move common seqno reset to intel_engine_cs.c
Applying: drm/i915/overlay: Use VMA as the primary tracker for images
Applying: drm/i915: Use VMA as the primary tracker for semaphore page
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gpu_error.c
M	drivers/gpu/drm/i915/intel_ringbuffer.c
M	drivers/gpu/drm/i915/intel_ringbuffer.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
Patch failed at 0023 drm/i915: Use VMA as the primary tracker for semaphore page
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".