[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Avoid enum conversion warning (rev2)

[Nick Desaulniers]

Do I need to be basing my patches on a different tree than Linus'?  In
general, how do people find what tree they should be basing their
patch off of?

On Sun, Nov 26, 2017 at 7:52 PM, Patchwork
<patchwork at emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915: Avoid enum conversion warning (rev2)
> URL   : https://patchwork.freedesktop.org/series/34269/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Avoid enum conversion warning
> Using index info to reconstruct a base tree...
> M       drivers/gpu/drm/i915/intel_ddi.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_ddi.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
> Patch failed at 0001 drm/i915: Avoid enum conversion warning
>
> Current HEAD:
> commit 2ac27dcb0eb2b64104e890031705714051be9ef8
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Sun Nov 26 19:47:42 2017 +0000
>
>     drm-tip: 2017y-11m-26d-19h-47m-14s UTC integration manifest
>