From mboxrd@z Thu Jan 1 00:00:00 1970
From: Philipp Zabel
Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Wed, 15 Apr 2015 11:09:02 +0200
Message-ID: <1429088942.3480.6.camel@pengutronix.de>
References: <20150415133309.24f0a36a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path:
Received: from metis.ext.pengutronix.de ([92.198.50.35]:35701 "EHLO
metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1751876AbbDOJJJ (ORCPT
); Wed, 15 Apr 2015 05:09:09 -0400
In-Reply-To: <20150415133309.24f0a36a@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID:
To: Stephen Rothwell , Dave Airlie , Mauro Carvalho Chehab
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , Hans Verkuil , Hyun Kwon
Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> Documentation/DocBook/media/v4l/subdev-formats.xml between commit
> 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on
> 24 and 32 bit busses") and e8b2d7a565ae ("[media] v4l: Sort YUV formats
> of v4l2_mbus_pixelcode") from the v4l-dvb tree and commits 08c38458be7e
> ("Add BGR888_1X24 and GBR888_1X24 media bus formats"), 0fc63eb104d7
> ("Add YUV8_1X24 media bus format") and 203508ef52e3 ("Add
> RGB666_1X24_CPADHI media bus format") from the drm tree.
>
> I fixed it up (almost certainly incorrectly - see below) and can carry
> the fix as necessary. Please sort out who "owns" this file and try to
> coordinate updates to it.
Together with the corresponding fixup for include/uapi/linux/media-bus-format.h,
how about this:
-----8<-----
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 0881d55..1af86c1 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -484,7 +484,7 @@ see .
MEDIA_BUS_FMT_RBG888_1X24
- 0x100e
+ 0x1016
&dash-ent-8;
r7
@@ -743,7 +743,7 @@ see .
MEDIA_BUS_FMT_RGB888_1X32_PADHI
- 0x100f
+ 0x1017
0
0
@@ -3463,7 +3463,7 @@ see .
MEDIA_BUS_FMT_VUY8_1X24
- 0x201a
+ 0x2025
&dash-ent-8;
v7
--
2.1.4
----->8-----
regards
Philipp