Maarten Lankhorst ff01e6971e drm/fourcc: Fix conflicting Y41x definitions ... There has unfortunately been a conflict with the following 3 commits: commit e9961ab95a 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 7ba0fee247 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 50bf5d7d59 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 double defines were the set to same value, and gcc apparently no longer warns about that. Fix this by using new XYVU for i915, without alpha, and making the Y41x definitions match msdn, with alpha. Fortunately we caught it early, and the conflict hasn't even landed in drm-next yet. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Brian Starkey <Brian.Starkey@arm.com> Cc: Swati Sharma <swati2.sharma@intel.com> Cc: Ayan Kumar Halder <ayan.halder@arm.com> Cc: malidp@foss.arm.com Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Sean Paul <sean@poorly.run> Cc: Dave Airlie <airlied@linux.ie> Cc: Liviu Dudau <Liviu.Dudau@arm.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190319121702.6814-1-maarten.lankhorst@linux.intel.com Acked-by: Jani Nikula <jani.nikula@intel.com> #irc Acked-by: Sean Paul <sean@poorly.run> Reviewed-by: Ayan Kumar halder <ayan.halder@arm.com>		2019-03-21 09:49:04 +01:00
..
acpi
asm-generic	Rename include/{uapi => }/asm-generic/shmparam.h really	2019-02-12 16:33:18 -08:00
clocksource
crypto
drm	tinydrm/mipi-dbi: Use dma-safe buffers for all SPI transfers	2019-03-20 12:02:41 +01:00
dt-bindings	ARM: SoC fixes for linux-5.0	2019-02-08 16:23:41 -08:00
keys	KEYS: user: Align the payload buffer	2019-02-22 10:11:19 -08:00
kvm	KVM: arm/arm64: vgic: Make vgic_cpu->ap_list_lock a raw_spinlock	2019-01-24 15:09:09 +01:00
linux	Merge drm/drm-next into drm-misc-next	2019-03-06 09:22:18 -05:00
math-emu
media
memory
misc
net	ipv4: Add ICMPv6 support when parse route ipproto	2019-03-01 16:41:27 -08:00
pcmcia
ras
rdma	RDMA/device: Expose ib_device_try_get(()	2019-01-21 14:33:08 -07:00
scsi
soc
sound	typed componented support + i915/snd-hda changes	2019-02-19 11:17:42 +01:00
target
trace	Linux 5.0-rc7	2019-02-18 13:27:15 +10:00
uapi	drm/fourcc: Fix conflicting Y41x definitions	2019-03-21 09:49:04 +01:00
video	gpu: ipu-v3: prg: add function to get channel configure status	2019-02-22 11:58:45 +01:00
xen	arm64/xen: fix xen-swiotlb cache flushing	2019-01-23 22:14:56 +01:00