✗ Fi.CI.BUILD: failure for series starting with [1/5] drm/i915/gem: Take runtime-pm wakeref prior to unbinding

Patchwork patchwork at emeril.freedesktop.org
Wed Dec 4 01:00:57 UTC 2019


== Series Details ==

Series: series starting with [1/5] drm/i915/gem: Take runtime-pm wakeref prior to unbinding
URL   : https://patchwork.freedesktop.org/series/70348/
State : failure

== Summary ==

Applying: drm/i915/gem: Take runtime-pm wakeref prior to unbinding
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
No changes -- Patch already applied.
Applying: drm/i915/gem: Avoid parking the vma as we unbind
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 0002 drm/i915/gem: Avoid parking the vma as we unbind
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