[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Flush pages on acquisition

[Chris Wilson]

Quoting Patchwork (2019-03-21 15:37:25)
> == Series Details ==
> 
> Series: series starting with [1/2] drm/i915: Flush pages on acquisition
> URL   : https://patchwork.freedesktop.org/series/58357/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915: Flush pages on acquisition
> Using index info to reconstruct a base tree...
> M       drivers/gpu/drm/i915/selftests/intel_lrc.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/selftests/intel_lrc.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_lrc.c

/me shakes fist!
-Chris