[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [v5,1/9] drm/i915: Include engine state on detecting a missed breadcrumb/seqno

[Chris Wilson]

Quoting Patchwork (2017-11-08 19:45:20)
> == Series Details ==
> 
> Series: series starting with [v5,1/9] drm/i915: Include engine state on detecting a missed breadcrumb/seqno
> URL   : https://patchwork.freedesktop.org/series/33452/
> State : failure
> 
> == Summary ==
> 
>   CHK     include/config/kernel.release
>   CHK     include/generated/uapi/linux/version.h
>   CHK     include/generated/utsrelease.h
>   CHK     include/generated/bounds.h
>   CHK     include/generated/timeconst.h
>   CHK     include/generated/asm-offsets.h
>   CALL    scripts/checksyscalls.sh
>   CHK     scripts/mod/devicetable-offsets.h
>   CHK     include/generated/compile.h
>   CHK     kernel/config_data.h
>   CC [M]  drivers/gpu/drm/i915/intel_display.o
> drivers/gpu/drm/i915/intel_display.c: In function ‘intel_modeset_gem_init’:
> drivers/gpu/drm/i915/intel_display.c:15192:1: error: version control conflict marker in file
>  <<<<<<< HEAD
>  ^~~~~~~
> drivers/gpu/drm/i915/intel_display.c:15194:1: error: version control conflict marker in file
>  =======
>  ^~~~~~~
> drivers/gpu/drm/i915/intel_display.c:15196:1: error: version control conflict marker in file
>  >>>>>>> drm/i915: Move GT powersaving init to i915_gem_init()
>  ^~~~~~~
> drivers/gpu/drm/i915/intel_display.c:15190:27: error: unused variable ‘dev_priv’ [-Werror=unused-variable]
>   struct drm_i915_private *dev_priv = to_i915(dev);
>                            ^~~~~~~~

So if we are not meant to be sending patches based on drm-tip, what tree
should we be using? >:
-Chris