From: Philipp Zabel <p.zabel@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Hyun Kwon <hyun.kwon@xilinx.com>
Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Wed, 15 Apr 2015 11:09:02 +0200 [thread overview]
Message-ID: <1429088942.3480.6.camel@pengutronix.de> (raw)
In-Reply-To: <20150415133309.24f0a36a@canb.auug.org.au>
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 <xref linkend="colorspaces" />.</entry>
</row>
<row id="MEDIA-BUS-FMT-RBG888-1X24">
<entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
- <entry>0x100e</entry>
+ <entry>0x1016</entry>
<entry></entry>
&dash-ent-8;
<entry>r<subscript>7</subscript></entry>
@@ -743,7 +743,7 @@ see <xref linkend="colorspaces" />.</entry>
</row>
<row id="MEDIA-BUS-FMT-RGB888-1X32-PADHI">
<entry>MEDIA_BUS_FMT_RGB888_1X32_PADHI</entry>
- <entry>0x100f</entry>
+ <entry>0x1017</entry>
<entry></entry>
<entry>0</entry>
<entry>0</entry>
@@ -3463,7 +3463,7 @@ see <xref linkend="colorspaces" />.</entry>
</row>
<row id="MEDIA-BUS-FMT-VUY8-1X24">
<entry>MEDIA_BUS_FMT_VUY8_1X24</entry>
- <entry>0x201a</entry>
+ <entry>0x2025</entry>
<entry></entry>
&dash-ent-8;
<entry>v<subscript>7</subscript></entry>
--
2.1.4
----->8-----
regards
Philipp
next prev parent reply other threads:[~2015-04-15 9:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 3:33 linux-next: manual merge of the drm tree with the v4l-dvb tree Stephen Rothwell
2015-04-15 9:09 ` Philipp Zabel [this message]
2015-04-17 3:07 ` Dave Airlie
2015-04-17 17:12 ` Philipp Zabel
-- strict thread matches above, loose matches on Subject: below --
2015-04-15 3:49 Stephen Rothwell
2015-04-15 9:00 ` Philipp Zabel
2016-07-13 2:25 Stephen Rothwell
2016-07-19 1:21 Stephen Rothwell
2017-04-11 0:27 Stephen Rothwell
2018-07-27 4:36 Stephen Rothwell
2018-07-27 7:57 ` Philipp Zabel
2018-07-27 10:32 ` Mauro Carvalho Chehab
2022-03-01 1:20 Stephen Rothwell
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=1429088942.3480.6.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=airlied@linux.ie \
--cc=hans.verkuil@cisco.com \
--cc=hyun.kwon@xilinx.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sfr@canb.auug.org.au \
/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).