✗ Fi.CI.BAT: failure for series starting with [01/41] drm/i915: Show GEM_TRACE when detecting a failed GPU idle

[Patchwork]

== Series Details ==

Series: series starting with [01/41] drm/i915: Show GEM_TRACE when detecting a failed GPU idle
URL   : https://patchwork.freedesktop.org/series/39686/
State : failure

== Summary ==

Applying: drm/i915: Show GEM_TRACE when detecting a failed GPU idle
Applying: drm/i915: Remove the impedance mismatch around intel_engine_enable_signaling
Applying: drm/i915: Disable preemption and sleeping while using the punit sideband
Applying: drm/i915: Lift acquiring the vlv punit magic to a common sb-get
Applying: drm/i915: Lift sideband locking for vlv_punit_(read|write)
Applying: drm/i915: Reduce RPS update frequency on Valleyview/Cherryview
Applying: Revert "drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3"
Applying: drm/i915: Replace pcu_lock with sb_lock
Applying: drm/i915: Separate sideband declarations to intel_sideband.h
Applying: drm/i915: Merge sbi read/write into a single accessor
Applying: drm/i915: Merge sandybridge_pcode_(read|write)
Applying: drm/i915: Move sandybride pcode access to intel_sideband.c
Applying: drm/i915: Finish the wait-for-wedge by retiring all the inflight requests
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...
No changes -- Patch already applied.
Applying: drm/i915: Reset ring space estimate after unwinding the request
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_request.c
M	drivers/gpu/drm/i915/intel_ringbuffer.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_request.c
Applying: drm/i915: Update ring position from request on retiring
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_request.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Include ring->emit in debugging
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_debugfs.c
M	drivers/gpu/drm/i915/intel_engine_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
Patch failed at 0016 drm/i915: Include ring->emit in debugging
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".