Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-21 Thread Maarten Lankhorst
Op 20-03-2019 om 19:22 schreef Sean Paul: > On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: >> There has unfortunately been a conflict with the following 3 commits: >> >> commit e9961ab95af81b8d29054361cd5f0c575102cf87 >> Author: Ayan Kumar Halder >> Date: Fri Nov 9 17:21:12 2

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-20 Thread Maarten Lankhorst
Op 20-03-2019 om 16:48 schreef 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 >> Date: Fri Nov 9 17:21:12 2018

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-20 Thread 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 > Date: Fri Nov 9 17:21:12 2018 + > drm: Added a new format DRM_FORMAT_XVYU

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-20 Thread Maarten Lankhorst
Op 19-03-2019 om 17:18 schreef Ville Syrjälä: > On Tue, Mar 19, 2019 at 05:06:36PM +0100, Maarten Lankhorst wrote: >> Op 19-03-2019 om 14:02 schreef Ville Syrjälä: >>> On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: There has unfortunately been a conflict with the following

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-19 Thread Ville Syrjälä
On Tue, Mar 19, 2019 at 05:06:36PM +0100, Maarten Lankhorst wrote: > Op 19-03-2019 om 14:02 schreef Ville Syrjälä: > > On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: > >> There has unfortunately been a conflict with the following 3 commits: > >> > >> commit e9961ab95af81b8d29054

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-19 Thread Maarten Lankhorst
Op 19-03-2019 om 14:02 schreef Ville Syrjälä: > On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: >> There has unfortunately been a conflict with the following 3 commits: >> >> commit e9961ab95af81b8d29054361cd5f0c575102cf87 >> Author: Ayan Kumar Halder >> Date: Fri Nov 9 17:21:

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-19 Thread Ayan Halder
On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: > There has unfortunately been a conflict with the following 3 commits: > > commit e9961ab95af81b8d29054361cd5f0c575102cf87 > Author: Ayan Kumar Halder > Date: Fri Nov 9 17:21:12 2018 + > drm: Added a new format DRM_FORM

Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-19 Thread Ville Syrjälä
On Tue, Mar 19, 2019 at 01:17:02PM +0100, Maarten Lankhorst wrote: > There has unfortunately been a conflict with the following 3 commits: > > commit e9961ab95af81b8d29054361cd5f0c575102cf87 > Author: Ayan Kumar Halder > Date: Fri Nov 9 17:21:12 2018 + > drm: Added a new format DRM_FORM

[PATCH] drm/fourcc: Fix conflicting Y41x definitions

2019-03-19 Thread Maarten Lankhorst
There has unfortunately been a conflict with the following 3 commits: commit e9961ab95af81b8d29054361cd5f0c575102cf87 Author: Ayan Kumar Halder Date: Fri Nov 9 17:21:12 2018 + drm: Added a new format DRM_FORMAT_XVYU2101010 commit 7ba0fee247ee7a36b3bfbed68f6988d980aa3aa3 Author: Brian S