[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] i915: convert to new mount API (rev2)

Patchwork patchwork at emeril.freedesktop.org
Fri Aug 2 14:22:45 UTC 2019


== Series Details ==

Series: series starting with [1/2] i915: convert to new mount API (rev2)
URL   : https://patchwork.freedesktop.org/series/64607/
State : failure

== Summary ==

Applying: i915: convert to new mount API
Applying: i915: do not leak module ref counter
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gemfs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gemfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gemfs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 i915: do not leak module ref counter
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 mailing list