[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/vgem: Fix typo in driver feature flags
patchwork at emeril.freedesktop.org
Mon Nov 5 14:57:59 UTC 2018
== Series Details ==
Series: drm/vgem: Fix typo in driver feature flags
URL : https://patchwork.freedesktop.org/series/52029/
State : failure
== Summary ==
Applying: drm/vgem: Fix typo in driver feature flags
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/vgem/vgem_drv.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/vgem: Fix typo in driver feature flags
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