✗ Fi.CI.BAT: failure for series starting with [1/6] drm/i915/selftests: Live tests emit requests and so require rpm

Patchwork patchwork at emeril.freedesktop.org
Fri Sep 14 15:46:48 UTC 2018


== Series Details ==

Series: series starting with [1/6] drm/i915/selftests: Live tests emit requests and so require rpm
URL   : https://patchwork.freedesktop.org/series/49705/
State : failure

== Summary ==

Applying: drm/i915/selftests: Live tests emit requests and so require rpm
Applying: drm/i915/execlists: Delay updating ring register state after resume
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_lrc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Park the GPU on module load
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
Applying: drm/i915: Check engine->default_state mapping on module load
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 0004 drm/i915: Check engine->default_state mapping on module load
Use 'git am --show-current-patch' to see the failed 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".



More information about the Intel-gfx-trybot mailing list