✗ Fi.CI.BAT: failure for series starting with [01/32] drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h

[Patchwork]

== Series Details ==

Series: series starting with [01/32] drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h
URL   : https://patchwork.freedesktop.org/series/58876/
State : failure

== Summary ==

Applying: drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/gvt/execlist.c
M	drivers/gpu/drm/i915/gvt/execlist.h
M	drivers/gpu/drm/i915/gvt/gvt.h
M	drivers/gpu/drm/i915/gvt/handlers.c
M	drivers/gpu/drm/i915/gvt/scheduler.c
M	drivers/gpu/drm/i915/gvt/scheduler.h
M	drivers/gpu/drm/i915/gvt/vgpu.c
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gem.h
M	drivers/gpu/drm/i915/i915_gem_context.c
M	drivers/gpu/drm/i915/i915_gem_context.h
M	drivers/gpu/drm/i915/i915_gem_gtt.h
M	drivers/gpu/drm/i915/i915_gpu_error.c
M	drivers/gpu/drm/i915/i915_gpu_error.h
M	drivers/gpu/drm/i915/i915_reset.c
M	drivers/gpu/drm/i915/i915_reset.h
M	drivers/gpu/drm/i915/i915_scheduler.h
M	drivers/gpu/drm/i915/i915_timeline.h
M	drivers/gpu/drm/i915/i915_timeline_types.h
M	drivers/gpu/drm/i915/intel_device_info.h
M	drivers/gpu/drm/i915/intel_engine_types.h
M	drivers/gpu/drm/i915/intel_guc_submission.h
M	drivers/gpu/drm/i915/intel_hangcheck.c
M	drivers/gpu/drm/i915/selftests/i915_gem_context.c
M	drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_engine_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_types.h
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/i915_scheduler_types.h
Auto-merging drivers/gpu/drm/i915/i915_scheduler_types.h
Auto-merging drivers/gpu/drm/i915/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile
Patch failed at 0001 drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h
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".