[Intel-gfx] [PATCH] drm/fourcc: Fix conflicting Y41x definitions

[Adam Jackson]

On Tue, 2019-03-19 at 13:17 +0100, Maarten Lankhorst wrote:
> There has unfortunately been a conflict with the following 3 commits:
> 
> commit e9961ab95af81b8d29054361cd5f0c575102cf87
> Author: Ayan Kumar Halder <ayan.halder at arm.com>
> Date:   Fri Nov 9 17:21:12 2018 +0000
>     drm: Added a new format DRM_FORMAT_XVYU2101010
> 
> commit 7ba0fee247ee7a36b3bfbed68f6988d980aa3aa3
> Author: Brian Starkey <brian.starkey at arm.com>
> Date:   Fri Oct 5 10:27:00 2018 +0100
> 
>     drm/fourcc: Add AFBC yuv fourccs for Mali
> 
> and
> 
> commit 50bf5d7d595fd0705ef3785f80e679b6da501e5b
> Author: Swati Sharma <swati2.sharma at intel.com>
> Date:   Mon Mar 4 17:26:33 2019 +0530
> 
>     drm: Add Y2xx and Y4xx (xx:10/12/16) format definitions and fourcc
> 
> Unfortunately gcc didn't warn about the redefinitions, because the
>

... sentence got cut off here.

- ajax