[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: drop various VLAs in i915_debugfs.c
patchwork at emeril.freedesktop.org
Wed Mar 14 19:55:42 UTC 2018
== Series Details ==
Series: drm/i915: drop various VLAs in i915_debugfs.c
URL : https://patchwork.freedesktop.org/series/39985/
State : failure
== Summary ==
Applying: drm/i915: drop various VLAs in i915_debugfs.c
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c
Patch failed at 0001 drm/i915: drop various VLAs in i915_debugfs.c
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".
More information about the Intel-gfx