Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Dave Airlie <airlied@redhat.com>,
	Boris Brezillion <boris.brezillon@free-electrons.com>,
	Hyun Kwon <hyun.kwon@xilinx.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Tue, 21 Apr 2015 10:49:52 +0300	[thread overview]
Message-ID: <5336539.Ny4ylH3Nve@avalon> (raw)
In-Reply-To: <20150421115409.73e6a066@canb.auug.org.au>

Hi Stephen,

On Tuesday 21 April 2015 11:54:09 Stephen Rothwell wrote:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> include/uapi/linux/media-bus-format.h between various commits from
> Linus' tree and various commits from the v4l-dvb tree.
> 
> I reported this previously against the drm tree but some fo the numbers
> have changed.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc include/uapi/linux/media-bus-format.h
> index 73c78f18a328,d391893064a0..000000000000
> --- a/include/uapi/linux/media-bus-format.h
> +++ b/include/uapi/linux/media-bus-format.h
> @@@ -45,18 -43,14 +45,20 @@@
>   #define MEDIA_BUS_FMT_RGB565_2X8_BE           0x1007
>   #define MEDIA_BUS_FMT_RGB565_2X8_LE           0x1008
>   #define MEDIA_BUS_FMT_RGB666_1X18             0x1009
>  +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI      0x1015
>  +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG               0x1010
>  +#define MEDIA_BUS_FMT_BGR888_1X24             0x1013
>  +#define MEDIA_BUS_FMT_GBR888_1X24             0x1014
> + #define MEDIA_BUS_FMT_RBG888_1X24             0x100e
>   #define MEDIA_BUS_FMT_RGB888_1X24             0x100a
>   #define MEDIA_BUS_FMT_RGB888_2X12_BE          0x100b
>   #define MEDIA_BUS_FMT_RGB888_2X12_LE          0x100c
>  +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG               0x1011
>  +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA      0x1012
>   #define MEDIA_BUS_FMT_ARGB8888_1X32           0x100d
> + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI               0x100f
>   
>  -/* YUV (including grey) - next is     0x2025 */
>  +/* YUV (including grey) - next is     0x2026 */
>   #define MEDIA_BUS_FMT_Y8_1X8                  0x2001
>   #define MEDIA_BUS_FMT_UV8_1X8                 0x2015
>   #define MEDIA_BUS_FMT_UYVY8_1_5X8             0x2002
> @@@ -82,13 -80,7 +88,14 @@@
>   #define MEDIA_BUS_FMT_VYUY10_1X20             0x201b
>   #define MEDIA_BUS_FMT_YUYV10_1X20             0x200d
>   #define MEDIA_BUS_FMT_YVYU10_1X20             0x200e
>  +#define MEDIA_BUS_FMT_YUV8_1X24                       0x2025

The above line is correct.

>  +#define MEDIA_BUS_FMT_YUV10_1X30              0x2016
>  +#define MEDIA_BUS_FMT_AYUV8_1X32              0x2017
>  +#define MEDIA_BUS_FMT_UYVY12_2X12             0x201c
>  +#define MEDIA_BUS_FMT_VYUY12_2X12             0x201d
>  +#define MEDIA_BUS_FMT_YUYV12_2X12             0x201e
>  +#define MEDIA_BUS_FMT_YVYU12_2X12             0x201f

The above 6 lines introduce duplicate defines, you can remove them.

> + #define MEDIA_BUS_FMT_VUY8_1X24                       0x2024
>   #define MEDIA_BUS_FMT_UYVY12_1X24             0x2020
>   #define MEDIA_BUS_FMT_VYUY12_1X24             0x2021
>   #define MEDIA_BUS_FMT_YUYV12_1X24             0x2022

-- 
Regards,

Laurent Pinchart