✗ Fi.CI.BAT: failure for Decode memdev info and bandwidth and implemnt latency WA

Patchwork patchwork at emeril.freedesktop.org
Thu Jul 12 06:48:46 UTC 2018


== Series Details ==

Series: Decode memdev info and bandwidth and implemnt latency WA
URL   : https://patchwork.freedesktop.org/series/46354/
State : failure

== Summary ==

Applying: drm/i915/bxt: Decode memory bandwidth and parameters
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
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
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
Patch failed at 0001 drm/i915/bxt: Decode memory bandwidth and parameters
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