✗ Fi.CI.BAT: failure for series starting with [01/33] drm/i915: Convert intel_vgt_(de)balloon to uncore

[Patchwork]

== Series Details ==

Series: series starting with [01/33] drm/i915: Convert intel_vgt_(de)balloon to uncore
URL   : https://patchwork.freedesktop.org/series/62378/
State : failure

== Summary ==

Applying: drm/i915: Convert intel_vgt_(de)balloon to uncore
Applying: drm/i915: Introduce struct intel_gt as replacement for anonymous i915->gt
Applying: drm/i915: Move intel_gt initialization to a separate file
Applying: drm/i915: Store some backpointers in struct intel_gt
Applying: drm/i915: Move intel_gt_pm_init under intel_gt_init_early
Applying: drm/i915: Make i915_check_and_clear_faults take intel_gt
Applying: drm/i915: Convert i915_gem_init_swizzling to intel_gt
Applying: drm/i915: Use intel_uncore_rmw in intel_gt_init_swizzling
Applying: drm/i915: Convert init_unused_rings to intel_gt
Applying: drm/i915: Convert gt workarounds to intel_gt
Applying: drm/i915: Store backpointer to intel_gt in the engine
Applying: drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt
Applying: drm/i915: Convert i915_ppgtt_init_hw to intel_gt
Applying: drm/i915: Consolidate some open coded mmio rmw
Applying: drm/i915: Convert i915_gem_init_hw to intel_gt
Applying: drm/i915: Move intel_engines_resume into common init
Applying: drm/i915: Stop using I915_READ/WRITE in intel_wopcm_init_hw
Applying: drm/i915: Compartmentalize i915_ggtt_probe_hw
Applying: drm/i915: Compartmentalize i915_ggtt_init_hw
Applying: drm/i915: Make ggtt invalidation work on ggtt
Applying: drm/i915: Store intel_gt backpointer in vm
Applying: drm/i915: Compartmentalize i915_gem_suspend/restore_gtt_mappings
Applying: drm/i915: Convert i915_gem_flush_ggtt_writes to intel_gt
Applying: drm/i915: Move i915_gem_chipset_flush to intel_gt
Applying: drm/i915: Compartmentalize timeline_init/park/fini
Applying: drm/i915: Compartmentalize i915_ggtt_cleanup_hw
Applying: drm/i915: Compartmentalize i915_gem_init_ggtt
Applying: drm/i915: Store ggtt pointer in intel_gt
Applying: drm/i915: Compartmentalize ring buffer creation
Applying: drm/i915: Save trip via top-level i915 in a few more places
Applying: drm/i915: Make timelines gt centric
Applying: drm/i915: Rename i915_timeline to intel_timeline and move under gt
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_engine_types.h
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/intel_ringbuffer.c
M	drivers/gpu/drm/i915/gt/mock_engine.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_request.c
M	drivers/gpu/drm/i915/selftests/i915_timeline.c
Falling back to patching base and 3-way merge...
Removing drivers/gpu/drm/i915/i915_timeline.h
Auto-merging drivers/gpu/drm/i915/i915_request.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c
Auto-merging drivers/gpu/drm/i915/gt/mock_engine.c
Auto-merging drivers/gpu/drm/i915/gt/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h
Patch failed at 0032 drm/i915: Rename i915_timeline to intel_timeline and move under gt
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".