✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915: Use local variable for SSEU info in GETPARAM ioctl

Patchwork patchwork at emeril.freedesktop.org
Wed Apr 24 19:00:06 UTC 2019


== Series Details ==

Series: series starting with [1/5] drm/i915: Use local variable for SSEU info in GETPARAM ioctl
URL   : https://patchwork.freedesktop.org/series/59897/
State : failure

== Summary ==

Applying: drm/i915: Use local variable for SSEU info in GETPARAM ioctl
Applying: drm/i915: Add macro for SSEU stride calculation
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h
Patch failed at 0002 drm/i915: Add macro for SSEU stride calculation
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