✗ Fi.CI.BAT: failure for series starting with [v7,01/13] drm/i915: Correctly handle error path in i915_gem_init_hw

[Patchwork]

== Series Details ==

Series: series starting with [v7,01/13] drm/i915: Correctly handle error path in i915_gem_init_hw
URL   : https://patchwork.freedesktop.org/series/41274/
State : failure

== Summary ==

Applying: drm/i915: Correctly handle error path in i915_gem_init_hw
Applying: drm/i915: Move i915_gem_fini to i915_gem.c
Applying: drm/i915: Introduce i915_gem_fini_hw for symmetry with i915_gem_init_hw
Applying: drm/i915: Add i915_gem_fini_hw to i915_gem_suspend
Applying: drm/i915: Add i915_gem_fini_hw to i915_reset
Applying: drm/i915: Split out parking from the idle worker for reuse
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Patch failed at 0006 drm/i915: Split out parking from the idle worker for reuse
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".