✗ Fi.CI.BUILD: failure for series starting with [01/14] drm/i915: Move GGTT fence registers under gt/

[Patchwork]

== Series Details ==

Series: series starting with [01/14] drm/i915: Move GGTT fence registers under gt/
URL   : https://patchwork.freedesktop.org/series/74704/
State : failure

== Summary ==

Applying: drm/i915: Move GGTT fence registers under gt/
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/gt/intel_ggtt.c
M	drivers/gpu/drm/i915/gt/intel_gtt.h
M	drivers/gpu/drm/i915/gt/intel_reset.c
M	drivers/gpu/drm/i915/gvt/aperture_gm.c
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gem.c
A	drivers/gpu/drm/i915/i915_gem_fence_reg.c
A	drivers/gpu/drm/i915/i915_gem_fence_reg.h
M	drivers/gpu/drm/i915/i915_vma.h
M	drivers/gpu/drm/i915/selftests/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_vma.h
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gtt.h
Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h
Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c
Patch failed at 0001 drm/i915: Move GGTT fence registers 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".