From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Adam Jackson <ajax@redhat.com>, dri-devel@lists.freedesktop.org
Cc: Maxime Ripard <maxime.ripard@bootlin.com>,
intel-gfx@lists.freedesktop.org,
Liviu Dudau <Liviu.Dudau@arm.com>,
Swati Sharma <swati2.sharma@intel.com>,
Dave Airlie <airlied@linux.ie>,
malidp@foss.arm.com, Ayan Kumar Halder <ayan.halder@arm.com>,
Sean Paul <sean@poorly.run>
Subject: Re: [PATCH] drm/fourcc: Fix conflicting Y41x definitions
Date: Wed, 20 Mar 2019 17:00:44 +0100 [thread overview]
Message-ID: <5e8c247d-2507-15d2-7abd-f10c2ea85fb1@linux.intel.com> (raw)
In-Reply-To: <3951e54f155e5375c0f2d057cbfb4183fa540526.camel@redhat.com>
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 <ayan.halder@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@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@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
>
... double defines were the set to same value, and gcc apparently no longer warns about that.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-03-20 16:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 12:17 [PATCH] drm/fourcc: Fix conflicting Y41x definitions Maarten Lankhorst
2019-03-19 13:02 ` Ville Syrjälä
2019-03-19 16:06 ` Maarten Lankhorst
2019-03-19 16:18 ` Ville Syrjälä
2019-03-20 10:28 ` Maarten Lankhorst
2019-03-19 13:58 ` Ayan Halder
2019-03-20 15:48 ` Adam Jackson
2019-03-20 16:00 ` Maarten Lankhorst [this message]
[not found] ` <20190320182207.GL114153@art_vandelay>
2019-03-21 9:14 ` Maarten Lankhorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e8c247d-2507-15d2-7abd-f10c2ea85fb1@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=Liviu.Dudau@arm.com \
--cc=airlied@linux.ie \
--cc=ajax@redhat.com \
--cc=ayan.halder@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=malidp@foss.arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=sean@poorly.run \
--cc=swati2.sharma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).