All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hans.verkuil@cisco.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hyun Kwon <hyun.kwon@xilinx.com>
Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Wed, 15 Apr 2015 13:33:09 +1000	[thread overview]
Message-ID: <20150415133309.24f0a36a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 12245 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml
index bc8d3fb9e4a9,18b71aff48c9..000000000000
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@@ -440,36 -482,96 +482,126 @@@ see <xref linkend="colorspaces" />.</en
  	      <entry>b<subscript>1</subscript></entry>
  	      <entry>b<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-RBG888-1X24">
 +	      <entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
 +	      <entry>0x100e</entry>
 +	      <entry></entry>
 +	      &dash-ent-8;
 +	      <entry>r<subscript>7</subscript></entry>
 +	      <entry>r<subscript>6</subscript></entry>
 +	      <entry>r<subscript>5</subscript></entry>
 +	      <entry>r<subscript>4</subscript></entry>
 +	      <entry>r<subscript>3</subscript></entry>
 +	      <entry>r<subscript>2</subscript></entry>
 +	      <entry>r<subscript>1</subscript></entry>
 +	      <entry>r<subscript>0</subscript></entry>
 +	      <entry>b<subscript>7</subscript></entry>
 +	      <entry>b<subscript>6</subscript></entry>
 +	      <entry>b<subscript>5</subscript></entry>
 +	      <entry>b<subscript>4</subscript></entry>
 +	      <entry>b<subscript>3</subscript></entry>
 +	      <entry>b<subscript>2</subscript></entry>
 +	      <entry>b<subscript>1</subscript></entry>
 +	      <entry>b<subscript>0</subscript></entry>
 +	      <entry>g<subscript>7</subscript></entry>
 +	      <entry>g<subscript>6</subscript></entry>
 +	      <entry>g<subscript>5</subscript></entry>
 +	      <entry>g<subscript>4</subscript></entry>
 +	      <entry>g<subscript>3</subscript></entry>
 +	      <entry>g<subscript>2</subscript></entry>
 +	      <entry>g<subscript>1</subscript></entry>
 +	      <entry>g<subscript>0</subscript></entry>
 +	    </row>
+ 	    <row id="MEDIA-BUS-FMT-RGB666-1X24_CPADHI">
+ 	      <entry>MEDIA_BUS_FMT_RGB666_1X24_CPADHI</entry>
+ 	      <entry>0x1015</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-BGR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_BGR888_1X24</entry>
+ 	      <entry>0x1013</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-GBR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_GBR888_1X24</entry>
+ 	      <entry>0x1014</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
  	    <row id="MEDIA-BUS-FMT-RGB888-1X24">
  	      <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
  	      <entry>0x100a</entry>
@@@ -2719,33 -3047,92 +3106,92 @@@
  	      <entry>u<subscript>1</subscript></entry>
  	      <entry>u<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-YDYUYDYV8-1X16">
 +	      <entry>MEDIA_BUS_FMT_YDYUYDYV8_1X16</entry>
 +	      <entry>0x2014</entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
 +	      <entry>y<subscript>7</subscript></entry>
 +	      <entry>y<subscript>6</subscript></entry>
 +	      <entry>y<subscript>5</subscript></entry>
 +	      <entry>y<subscript>4</subscript></entry>
 +	      <entry>y<subscript>3</subscript></entry>
 +	      <entry>y<subscript>2</subscript></entry>
 +	      <entry>y<subscript>1</subscript></entry>
 +	      <entry>y<subscript>0</subscript></entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
+ 	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
+ 	      <entry>0x2024</entry>
+ 	      <entry></entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
+ 	      <entry>u<subscript>7</subscript></entry>
+ 	      <entry>u<subscript>6</subscript></entry>
+ 	      <entry>u<subscript>5</subscript></entry>
+ 	      <entry>u<subscript>4</subscript></entry>
+ 	      <entry>u<subscript>3</subscript></entry>
+ 	      <entry>u<subscript>2</subscript></entry>
+ 	      <entry>u<subscript>1</subscript></entry>
+ 	      <entry>u<subscript>0</subscript></entry>
+ 	      <entry>v<subscript>7</subscript></entry>
+ 	      <entry>v<subscript>6</subscript></entry>
+ 	      <entry>v<subscript>5</subscript></entry>
+ 	      <entry>v<subscript>4</subscript></entry>
+ 	      <entry>v<subscript>3</subscript></entry>
+ 	      <entry>v<subscript>2</subscript></entry>
+ 	      <entry>v<subscript>1</subscript></entry>
+ 	      <entry>v<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV10-1X30">
+ 	      <entry>MEDIA_BUS_FMT_YUV10_1X30</entry>
+ 	      <entry>0x2016</entry>
+ 	      <entry></entry>
 -	      <entry>-</entry>
 -	      <entry>-</entry>
 -	      <entry>y<subscript>9</subscript></entry>
 -	      <entry>y<subscript>8</subscript></entry>
++	      &dash-ent-16;
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
 -	      <entry>u<subscript>9</subscript></entry>
 -	      <entry>u<subscript>8</subscript></entry>
 -	      <entry>u<subscript>7</subscript></entry>
 -	      <entry>u<subscript>6</subscript></entry>
 -	      <entry>u<subscript>5</subscript></entry>
 -	      <entry>u<subscript>4</subscript></entry>
 -	      <entry>u<subscript>3</subscript></entry>
 -	      <entry>u<subscript>2</subscript></entry>
 -	      <entry>u<subscript>1</subscript></entry>
 -	      <entry>u<subscript>0</subscript></entry>
 -	      <entry>v<subscript>9</subscript></entry>
 -	      <entry>v<subscript>8</subscript></entry>
 -	      <entry>v<subscript>7</subscript></entry>
 -	      <entry>v<subscript>6</subscript></entry>
 -	      <entry>v<subscript>5</subscript></entry>
 -	      <entry>v<subscript>4</subscript></entry>
 -	      <entry>v<subscript>3</subscript></entry>
 -	      <entry>v<subscript>2</subscript></entry>
 -	      <entry>v<subscript>1</subscript></entry>
 -	      <entry>v<subscript>0</subscript></entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
  	    </row>
 -	    <row id="MEDIA-BUS-FMT-AYUV8-1X32">
 -	      <entry>MEDIA_BUS_FMT_AYUV8_1X32</entry>
 -	      <entry>0x2017</entry>
 +	    <row>
  	      <entry></entry>
 -	      <entry>a<subscript>7</subscript></entry>
 -	      <entry>a<subscript>6</subscript></entry>
 -	      <entry>a<subscript>5</subscript></entry>
 -	      <entry>a<subscript>4</subscript></entry>
 -	      <entry>a<subscript>3</subscript></entry>
 -	      <entry>a<subscript>2</subscript></entry>
 -	      <entry>a<subscript>1</subscript></entry>
 -	      <entry>a<subscript>0</subscript></entry>
 +	      <entry></entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
  	      <entry>y<subscript>7</subscript></entry>
  	      <entry>y<subscript>6</subscript></entry>
  	      <entry>y<subscript>5</subscript></entry>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hans.verkuil@cisco.com>Laurent Pinchart
	<laurent.pinchart@ideasonboard.com>,
	Hyun Kwon <hyun.kwon@xilinx.com>
Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree
Date: Wed, 15 Apr 2015 13:33:09 +1000	[thread overview]
Message-ID: <20150415133309.24f0a36a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 12245 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml
index bc8d3fb9e4a9,18b71aff48c9..000000000000
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@@ -440,36 -482,96 +482,126 @@@ see <xref linkend="colorspaces" />.</en
  	      <entry>b<subscript>1</subscript></entry>
  	      <entry>b<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-RBG888-1X24">
 +	      <entry>MEDIA_BUS_FMT_RBG888_1X24</entry>
 +	      <entry>0x100e</entry>
 +	      <entry></entry>
 +	      &dash-ent-8;
 +	      <entry>r<subscript>7</subscript></entry>
 +	      <entry>r<subscript>6</subscript></entry>
 +	      <entry>r<subscript>5</subscript></entry>
 +	      <entry>r<subscript>4</subscript></entry>
 +	      <entry>r<subscript>3</subscript></entry>
 +	      <entry>r<subscript>2</subscript></entry>
 +	      <entry>r<subscript>1</subscript></entry>
 +	      <entry>r<subscript>0</subscript></entry>
 +	      <entry>b<subscript>7</subscript></entry>
 +	      <entry>b<subscript>6</subscript></entry>
 +	      <entry>b<subscript>5</subscript></entry>
 +	      <entry>b<subscript>4</subscript></entry>
 +	      <entry>b<subscript>3</subscript></entry>
 +	      <entry>b<subscript>2</subscript></entry>
 +	      <entry>b<subscript>1</subscript></entry>
 +	      <entry>b<subscript>0</subscript></entry>
 +	      <entry>g<subscript>7</subscript></entry>
 +	      <entry>g<subscript>6</subscript></entry>
 +	      <entry>g<subscript>5</subscript></entry>
 +	      <entry>g<subscript>4</subscript></entry>
 +	      <entry>g<subscript>3</subscript></entry>
 +	      <entry>g<subscript>2</subscript></entry>
 +	      <entry>g<subscript>1</subscript></entry>
 +	      <entry>g<subscript>0</subscript></entry>
 +	    </row>
+ 	    <row id="MEDIA-BUS-FMT-RGB666-1X24_CPADHI">
+ 	      <entry>MEDIA_BUS_FMT_RGB666_1X24_CPADHI</entry>
+ 	      <entry>0x1015</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>0</entry>
+ 	      <entry>0</entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-BGR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_BGR888_1X24</entry>
+ 	      <entry>0x1013</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-GBR888-1X24">
+ 	      <entry>MEDIA_BUS_FMT_GBR888_1X24</entry>
+ 	      <entry>0x1014</entry>
+ 	      <entry></entry>
+ 	      &dash-ent-8;
+ 	      <entry>g<subscript>7</subscript></entry>
+ 	      <entry>g<subscript>6</subscript></entry>
+ 	      <entry>g<subscript>5</subscript></entry>
+ 	      <entry>g<subscript>4</subscript></entry>
+ 	      <entry>g<subscript>3</subscript></entry>
+ 	      <entry>g<subscript>2</subscript></entry>
+ 	      <entry>g<subscript>1</subscript></entry>
+ 	      <entry>g<subscript>0</subscript></entry>
+ 	      <entry>b<subscript>7</subscript></entry>
+ 	      <entry>b<subscript>6</subscript></entry>
+ 	      <entry>b<subscript>5</subscript></entry>
+ 	      <entry>b<subscript>4</subscript></entry>
+ 	      <entry>b<subscript>3</subscript></entry>
+ 	      <entry>b<subscript>2</subscript></entry>
+ 	      <entry>b<subscript>1</subscript></entry>
+ 	      <entry>b<subscript>0</subscript></entry>
+ 	      <entry>r<subscript>7</subscript></entry>
+ 	      <entry>r<subscript>6</subscript></entry>
+ 	      <entry>r<subscript>5</subscript></entry>
+ 	      <entry>r<subscript>4</subscript></entry>
+ 	      <entry>r<subscript>3</subscript></entry>
+ 	      <entry>r<subscript>2</subscript></entry>
+ 	      <entry>r<subscript>1</subscript></entry>
+ 	      <entry>r<subscript>0</subscript></entry>
+ 	    </row>
  	    <row id="MEDIA-BUS-FMT-RGB888-1X24">
  	      <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
  	      <entry>0x100a</entry>
@@@ -2719,33 -3047,92 +3106,92 @@@
  	      <entry>u<subscript>1</subscript></entry>
  	      <entry>u<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-YDYUYDYV8-1X16">
 +	      <entry>MEDIA_BUS_FMT_YDYUYDYV8_1X16</entry>
 +	      <entry>0x2014</entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
 +	      <entry>y<subscript>7</subscript></entry>
 +	      <entry>y<subscript>6</subscript></entry>
 +	      <entry>y<subscript>5</subscript></entry>
 +	      <entry>y<subscript>4</subscript></entry>
 +	      <entry>y<subscript>3</subscript></entry>
 +	      <entry>y<subscript>2</subscript></entry>
 +	      <entry>y<subscript>1</subscript></entry>
 +	      <entry>y<subscript>0</subscript></entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	      <entry>d</entry>
++	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
+ 	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
+ 	      <entry>0x2024</entry>
+ 	      <entry></entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>-</entry>
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
+ 	      <entry>u<subscript>7</subscript></entry>
+ 	      <entry>u<subscript>6</subscript></entry>
+ 	      <entry>u<subscript>5</subscript></entry>
+ 	      <entry>u<subscript>4</subscript></entry>
+ 	      <entry>u<subscript>3</subscript></entry>
+ 	      <entry>u<subscript>2</subscript></entry>
+ 	      <entry>u<subscript>1</subscript></entry>
+ 	      <entry>u<subscript>0</subscript></entry>
+ 	      <entry>v<subscript>7</subscript></entry>
+ 	      <entry>v<subscript>6</subscript></entry>
+ 	      <entry>v<subscript>5</subscript></entry>
+ 	      <entry>v<subscript>4</subscript></entry>
+ 	      <entry>v<subscript>3</subscript></entry>
+ 	      <entry>v<subscript>2</subscript></entry>
+ 	      <entry>v<subscript>1</subscript></entry>
+ 	      <entry>v<subscript>0</subscript></entry>
+ 	    </row>
+ 	    <row id="MEDIA-BUS-FMT-YUV10-1X30">
+ 	      <entry>MEDIA_BUS_FMT_YUV10_1X30</entry>
+ 	      <entry>0x2016</entry>
+ 	      <entry></entry>
 -	      <entry>-</entry>
 -	      <entry>-</entry>
 -	      <entry>y<subscript>9</subscript></entry>
 -	      <entry>y<subscript>8</subscript></entry>
++	      &dash-ent-16;
+ 	      <entry>y<subscript>7</subscript></entry>
+ 	      <entry>y<subscript>6</subscript></entry>
+ 	      <entry>y<subscript>5</subscript></entry>
+ 	      <entry>y<subscript>4</subscript></entry>
+ 	      <entry>y<subscript>3</subscript></entry>
+ 	      <entry>y<subscript>2</subscript></entry>
+ 	      <entry>y<subscript>1</subscript></entry>
+ 	      <entry>y<subscript>0</subscript></entry>
 -	      <entry>u<subscript>9</subscript></entry>
 -	      <entry>u<subscript>8</subscript></entry>
 -	      <entry>u<subscript>7</subscript></entry>
 -	      <entry>u<subscript>6</subscript></entry>
 -	      <entry>u<subscript>5</subscript></entry>
 -	      <entry>u<subscript>4</subscript></entry>
 -	      <entry>u<subscript>3</subscript></entry>
 -	      <entry>u<subscript>2</subscript></entry>
 -	      <entry>u<subscript>1</subscript></entry>
 -	      <entry>u<subscript>0</subscript></entry>
 -	      <entry>v<subscript>9</subscript></entry>
 -	      <entry>v<subscript>8</subscript></entry>
 -	      <entry>v<subscript>7</subscript></entry>
 -	      <entry>v<subscript>6</subscript></entry>
 -	      <entry>v<subscript>5</subscript></entry>
 -	      <entry>v<subscript>4</subscript></entry>
 -	      <entry>v<subscript>3</subscript></entry>
 -	      <entry>v<subscript>2</subscript></entry>
 -	      <entry>v<subscript>1</subscript></entry>
 -	      <entry>v<subscript>0</subscript></entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
 +	      <entry>d</entry>
  	    </row>
 -	    <row id="MEDIA-BUS-FMT-AYUV8-1X32">
 -	      <entry>MEDIA_BUS_FMT_AYUV8_1X32</entry>
 -	      <entry>0x2017</entry>
 +	    <row>
  	      <entry></entry>
 -	      <entry>a<subscript>7</subscript></entry>
 -	      <entry>a<subscript>6</subscript></entry>
 -	      <entry>a<subscript>5</subscript></entry>
 -	      <entry>a<subscript>4</subscript></entry>
 -	      <entry>a<subscript>3</subscript></entry>
 -	      <entry>a<subscript>2</subscript></entry>
 -	      <entry>a<subscript>1</subscript></entry>
 -	      <entry>a<subscript>0</subscript></entry>
 +	      <entry></entry>
 +	      <entry></entry>
 +	      &dash-ent-16;
  	      <entry>y<subscript>7</subscript></entry>
  	      <entry>y<subscript>6</subscript></entry>
  	      <entry>y<subscript>5</subscript></entry>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-04-15  3:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-15  3:33 Stephen Rothwell [this message]
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
2015-04-17  3:07   ` Dave Airlie
2015-04-17 17:12     ` Philipp Zabel
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  4:36 ` Stephen Rothwell
2018-07-27  7:57 ` Philipp Zabel
2018-07-27  7:57   ` Philipp Zabel
2018-07-27 10:32 ` Mauro Carvalho Chehab
2018-07-27 10:32   ` Mauro Carvalho Chehab
2022-03-01  1:20 Stephen Rothwell
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=20150415133309.24f0a36a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --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=p.zabel@pengutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.