✗ Fi.CI.BAT: failure for drm/i915: remove confusing GPIO vs PCH_GPIO

Patchwork patchwork at emeril.freedesktop.org
Sat Jun 30 08:44:33 UTC 2018


== Series Details ==

Series: drm/i915: remove confusing GPIO vs PCH_GPIO
URL   : https://patchwork.freedesktop.org/series/45698/
State : failure

== Summary ==

Applying: drm/i915: remove confusing GPIO vs PCH_GPIO
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_reg.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_reg.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
Patch failed at 0001 drm/i915: remove confusing GPIO vs PCH_GPIO
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