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

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

[Stephen Rothwell]

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

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
 +#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
+ #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

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

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

[Laurent Pinchart]

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

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

[Stephen Rothwell]

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

Hi Laurent,

On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
> 
> >  +#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.

OK, thanks, done for tomorrow.  Though hopefully all this will be
resolved soon.

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

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

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

[Mauro Carvalho Chehab]

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

Em Tue, 21 Apr 2015 18:02:43 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Laurent,
> 
> On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
> > 
> > >  +#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.
> 
> OK, thanks, done for tomorrow.  Though hopefully all this will be
> resolved soon.

I think that the best is for me to merge from the DRM branch that Linus
picked, and solve the conflict there.

This way, it should be a way easier for Linus to pick it, and not
manually solve those conflicts with are not trivial.

Laurent/Philipp,

Please double-check if everything went fine on my conflict solving.
I'm pushing it at branch "fixes" at the media development tree:
	git://linuxtv.org/media_tree.git fixes
	
In any case, I double-checked that it is compiling and it is producing the
media DocBook.

PS.: I intend to send this latter today for being merged upstream.

	
Thanks,
Mauro

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

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

[Laurent Pinchart]

Hi Mauro,

On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote:
> Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu:
> > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote:
> > > >  +#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.
> > 
> > OK, thanks, done for tomorrow.  Though hopefully all this will be
> > resolved soon.
> 
> I think that the best is for me to merge from the DRM branch that Linus
> picked, and solve the conflict there.
> 
> This way, it should be a way easier for Linus to pick it, and not
> manually solve those conflicts with are not trivial.
> 
> Laurent/Philipp,
> 
> Please double-check if everything went fine on my conflict solving.
> I'm pushing it at branch "fixes" at the media development tree:
> 	git://linuxtv.org/media_tree.git fixes
> 
> In any case, I double-checked that it is compiling and it is producing the
> media DocBook.
> 
> PS.: I intend to send this latter today for being merged upstream.

The numerical values are correct, but the order of the YUV formats got messed
up. Could you squash the following change into the merge ?

diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index d66463b..2588ad7 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -3432,6 +3432,43 @@ see <xref linkend="colorspaces" />.</entry>
 	      <entry>y<subscript>1</subscript></entry>
 	      <entry>y<subscript>0</subscript></entry>
 	    </row>
+	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
+	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
+	      <entry>0x2025</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-UYVY12-1X24">
 	      <entry>MEDIA_BUS_FMT_UYVY12_1X24</entry>
 	      <entry>0x2020</entry>
@@ -3672,43 +3709,6 @@ see <xref linkend="colorspaces" />.</entry>
 	      <entry>u<subscript>1</subscript></entry>
 	      <entry>u<subscript>0</subscript></entry>
 	    </row>
-	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
-	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
-	      <entry>0x2025</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>
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 3eeb8cc..190d491 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -75,6 +75,10 @@
 #define MEDIA_BUS_FMT_YUYV10_2X10		0x200b
 #define MEDIA_BUS_FMT_YVYU10_2X10		0x200c
 #define MEDIA_BUS_FMT_Y12_1X12			0x2013
+#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
 #define MEDIA_BUS_FMT_UYVY8_1X16		0x200f
 #define MEDIA_BUS_FMT_VYUY8_1X16		0x2010
 #define MEDIA_BUS_FMT_YUYV8_1X16		0x2011
@@ -86,16 +90,12 @@
 #define MEDIA_BUS_FMT_YVYU10_1X20		0x200e
 #define MEDIA_BUS_FMT_VUY8_1X24			0x2024
 #define MEDIA_BUS_FMT_YUV8_1X24			0x2025
-#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
 #define MEDIA_BUS_FMT_UYVY12_1X24		0x2020
 #define MEDIA_BUS_FMT_VYUY12_1X24		0x2021
 #define MEDIA_BUS_FMT_YUYV12_1X24		0x2022
 #define MEDIA_BUS_FMT_YVYU12_1X24		0x2023
+#define MEDIA_BUS_FMT_YUV10_1X30		0x2016
+#define MEDIA_BUS_FMT_AYUV8_1X32		0x2017
 
 /* Bayer - next is	0x3019 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001


-- 
Regards,

Laurent Pinchart

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

[Mauro Carvalho Chehab]

Em Tue, 21 Apr 2015 15:38:02 +0300
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:

> Hi Mauro,
> 
> On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote:
> > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu:
> > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote:
> > > > >  +#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.
> > > 
> > > OK, thanks, done for tomorrow.  Though hopefully all this will be
> > > resolved soon.
> > 
> > I think that the best is for me to merge from the DRM branch that Linus
> > picked, and solve the conflict there.
> > 
> > This way, it should be a way easier for Linus to pick it, and not
> > manually solve those conflicts with are not trivial.
> > 
> > Laurent/Philipp,
> > 
> > Please double-check if everything went fine on my conflict solving.
> > I'm pushing it at branch "fixes" at the media development tree:
> > 	git://linuxtv.org/media_tree.git fixes
> > 
> > In any case, I double-checked that it is compiling and it is producing the
> > media DocBook.
> > 
> > PS.: I intend to send this latter today for being merged upstream.
> 
> The numerical values are correct, but the order of the YUV formats got messed
> up. Could you squash the following change into the merge ?

Sure. Squashed.

Regards,
Mauro

> 
> diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
> index d66463b..2588ad7 100644
> --- a/Documentation/DocBook/media/v4l/subdev-formats.xml
> +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
> @@ -3432,6 +3432,43 @@ see <xref linkend="colorspaces" />.</entry>
>  	      <entry>y<subscript>1</subscript></entry>
>  	      <entry>y<subscript>0</subscript></entry>
>  	    </row>
> +	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
> +	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
> +	      <entry>0x2025</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-UYVY12-1X24">
>  	      <entry>MEDIA_BUS_FMT_UYVY12_1X24</entry>
>  	      <entry>0x2020</entry>
> @@ -3672,43 +3709,6 @@ see <xref linkend="colorspaces" />.</entry>
>  	      <entry>u<subscript>1</subscript></entry>
>  	      <entry>u<subscript>0</subscript></entry>
>  	    </row>
> -	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
> -	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
> -	      <entry>0x2025</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>
> diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
> index 3eeb8cc..190d491 100644
> --- a/include/uapi/linux/media-bus-format.h
> +++ b/include/uapi/linux/media-bus-format.h
> @@ -75,6 +75,10 @@
>  #define MEDIA_BUS_FMT_YUYV10_2X10		0x200b
>  #define MEDIA_BUS_FMT_YVYU10_2X10		0x200c
>  #define MEDIA_BUS_FMT_Y12_1X12			0x2013
> +#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
>  #define MEDIA_BUS_FMT_UYVY8_1X16		0x200f
>  #define MEDIA_BUS_FMT_VYUY8_1X16		0x2010
>  #define MEDIA_BUS_FMT_YUYV8_1X16		0x2011
> @@ -86,16 +90,12 @@
>  #define MEDIA_BUS_FMT_YVYU10_1X20		0x200e
>  #define MEDIA_BUS_FMT_VUY8_1X24			0x2024
>  #define MEDIA_BUS_FMT_YUV8_1X24			0x2025
> -#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
>  #define MEDIA_BUS_FMT_UYVY12_1X24		0x2020
>  #define MEDIA_BUS_FMT_VYUY12_1X24		0x2021
>  #define MEDIA_BUS_FMT_YUYV12_1X24		0x2022
>  #define MEDIA_BUS_FMT_YVYU12_1X24		0x2023
> +#define MEDIA_BUS_FMT_YUV10_1X30		0x2016
> +#define MEDIA_BUS_FMT_AYUV8_1X32		0x2017
>  
>  /* Bayer - next is	0x3019 */
>  #define MEDIA_BUS_FMT_SBGGR8_1X8		0x3001
> 
> 

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

[Philipp Zabel]

Am Dienstag, den 21.04.2015, 10:12 -0300 schrieb Mauro Carvalho Chehab:
> Em Tue, 21 Apr 2015 15:38:02 +0300
> Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> 
> > Hi Mauro,
> > 
> > On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote:
> > > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu:
> > > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote:
> > > > > >  +#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.
> > > > 
> > > > OK, thanks, done for tomorrow.  Though hopefully all this will be
> > > > resolved soon.
> > > 
> > > I think that the best is for me to merge from the DRM branch that Linus
> > > picked, and solve the conflict there.
> > > 
> > > This way, it should be a way easier for Linus to pick it, and not
> > > manually solve those conflicts with are not trivial.
> > > 
> > > Laurent/Philipp,
> > > 
> > > Please double-check if everything went fine on my conflict solving.
> > > I'm pushing it at branch "fixes" at the media development tree:
> > > 	git://linuxtv.org/media_tree.git fixes
> > > 
> > > In any case, I double-checked that it is compiling and it is producing the
> > > media DocBook.
> > > 
> > > PS.: I intend to send this latter today for being merged upstream.
> > 
> > The numerical values are correct, but the order of the YUV formats got messed
> > up. Could you squash the following change into the merge ?
> 
> Sure. Squashed.

Thanks, this looks good to me.

One small thing, I noticed the MEDIA_BUS_FMT_VUY8_1X24 documentation has
the wrong value: It says 0x201a, but it should be 0x2024. This was
already wrong in the original patch: 2dca0551e4e2 ("[media] v4l: Add
VUY8 24 bits bus format").

regards
Philipp

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

[Sean Young]

Hi Mauro,

On Fri, Oct 01, 2021 at 10:33:23AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   drivers/media/rc/ir_toy.c
> 
> between commit:
> 
>   f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")
> 
> from Linus' tree and commit:
> 
>   4114978dcd24 ("media: ir_toy: prevent device from hanging during transmit")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I just used the latter) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Like I said on irc, this needs fixing up. You've changed a commit which is
already upstream.

Thanks,

Sean

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/rc/ir_toy.c

between commit:

  f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")

from Linus' tree and commit:

  4114978dcd24 ("media: ir_toy: prevent device from hanging during transmit")

from the v4l-dvb tree.

I fixed it up (I just used the latter) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/v4l2-core/videobuf-vmalloc.c

between commit:

  77512baaea9a ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 237")

from Linus' tree and commit:

  513dbd35b5d9 ("media: add SPDX headers to some files")

from the v4l-dvb tree.

I fixed it up (I used the former's SPDX line (GPL-2.0-only v. GPL-2.0),
but the latter's Copyright line) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the v4l-dvb tree got conflicts in:

  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
  drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
  drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
  drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
  drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
  drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
  drivers/media/platform/mtk-vcodec/vdec_drv_base.h
  drivers/media/platform/mtk-vcodec/vdec_drv_if.c
  drivers/media/platform/mtk-vcodec/vdec_drv_if.h
  drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
  drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
  drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
  drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
  drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
  drivers/media/platform/mtk-vcodec/venc_drv_base.h
  drivers/media/platform/mtk-vcodec/venc_drv_if.c
  drivers/media/platform/mtk-vcodec/venc_drv_if.h
  drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
  drivers/media/platform/mtk-vcodec/venc_vpu_if.c
  drivers/media/platform/mtk-vcodec/venc_vpu_if.h

between commit:

  1802d0beecaf ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174")

from Linus' tree and commit:

  9293e39c5d7f ("media: mtk-vcodec: replace GPLv2 with SPDX")

from the v4l-dvb tree.

I fixed it up (I just iused the versions from the v4l-dvb tree -
although I think that they may have gone to far in removing copyright
notices as well as the license boilerplate) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/platform/coda/Makefile

between commit:

  ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")

from Linus' tree and commit:

  94b7ddb91c16 ("media: coda: remove -I$(src) header search path")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/media/platform/coda/Makefile
index f13adacd924e,3eed82137257..000000000000
--- a/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@@ -1,6 -1,3 +1,5 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)
 +
  coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
  
  obj-$(CONFIG_VIDEO_CODA) += coda.o

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

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

[Stephen Rothwell]

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

Hi all,

On Fri, 1 Feb 2019 10:22:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   drivers/media/platform/vim2m.c
> 
> between commit:
> 
>   240809ef6630 ("media: vim2m: only cancel work if it is for right context")
> 
> from Linus' tree and commit:
> 
>   b3e64e5b0778 ("media: vim2m: use per-file handler work queue")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I think - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
> 
> diff --cc drivers/media/platform/vim2m.c
> index 89d9c4c21037,e31c14c7d37f..000000000000
> --- a/drivers/media/platform/vim2m.c
> +++ b/drivers/media/platform/vim2m.c
> @@@ -806,10 -904,7 +904,9 @@@ static void vim2m_stop_streaming(struc
>   	struct vb2_v4l2_buffer *vbuf;
>   	unsigned long flags;
>   
>  -	cancel_delayed_work_sync(&ctx->work_run);
>  +	if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx)
> - 		cancel_delayed_work_sync(&dev->work_run);
> ++		cancel_delayed_work_sync(&ctx->work_run);
>  +
>   	for (;;) {
>   		if (V4L2_TYPE_IS_OUTPUT(q->type))
>   			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);

Well, that wasn't right, so instead I just effectively reverted the
commit from Linus' tree ...

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/platform/vim2m.c

between commit:

  240809ef6630 ("media: vim2m: only cancel work if it is for right context")

from Linus' tree and commit:

  b3e64e5b0778 ("media: vim2m: use per-file handler work queue")

from the v4l-dvb tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/media/platform/vim2m.c
index 89d9c4c21037,e31c14c7d37f..000000000000
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@@ -806,10 -904,7 +904,9 @@@ static void vim2m_stop_streaming(struc
  	struct vb2_v4l2_buffer *vbuf;
  	unsigned long flags;
  
 -	cancel_delayed_work_sync(&ctx->work_run);
 +	if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx)
- 		cancel_delayed_work_sync(&dev->work_run);
++		cancel_delayed_work_sync(&ctx->work_run);
 +
  	for (;;) {
  		if (V4L2_TYPE_IS_OUTPUT(q->type))
  			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);

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

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  Documentation/DocBook/Makefile

between commit:

  88e196b337d6 ("Documentation/DocBook: remove gpu.tmpl")

from Linus' tree and commit:

  43f71d93a0cb ("doc-rst: Remove the media docbook")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/DocBook/Makefile
index 8e6dd4b14314,2bfd664b5e35..000000000000
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,11 -16,9 +16,9 @@@ DOCBOOKS := z8530book.xml device-driver
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
  	    80211.xml debugobjects.xml sh.xml regulator.xml \
  	    alsa-driver-api.xml writing-an-alsa-driver.xml \
- 	    tracepoint.xml media_api.xml w1.xml \
 -	    tracepoint.xml gpu.xml w1.xml \
++	    tracepoint.xml w1.xml \
  	    writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
- include Documentation/DocBook/media/Makefile
- 
  ###
  # The build process is as follows (targets):
  #              (xmldocs) [by docproc]

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  mm/Makefile

between commit:

  c1a4de99fada ("userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation")

from Linus' tree and commit:

  8025e5ddf9c1 ("[media] mm: Provide new get_vaddr_frames() helper")

from the v4l-dvb tree.

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 mm/Makefile
index b424d5e5b6ff,be5d5c866305..000000000000
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -78,4 -78,4 +78,5 @@@ obj-$(CONFIG_CMA)	+= cma.
  obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
  obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
  obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
 +obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
+ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/DocBook/media/v4l/subdev-formats.xml between various
commits from Linus' tree and various commits from the v4l-dvb tree.

I reported this previously against the drm tree, but some of the
numbers have changed now.

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 Documentation/DocBook/media/v4l/subdev-formats.xml
index 553a38024745,bc8d3fb9e4a9..000000000000
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@@ -482,96 -440,36 +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-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-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-RGB888-1X24">
  	      <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
  	      <entry>0x100a</entry>
@@@ -3047,92 -2719,33 +3106,92 @@@
  	      <entry>u<subscript>1</subscript></entry>
  	      <entry>u<subscript>0</subscript></entry>
  	    </row>
 +	    <row id="MEDIA-BUS-FMT-YUV8-1X24">
 +	      <entry>MEDIA_BUS_FMT_YUV8_1X24</entry>
 +	      <entry>0x2025</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 id="MEDIA-BUS-FMT-YDYUYDYV8-1X16">
+ 	      <entry>MEDIA_BUS_FMT_YDYUYDYV8_1X16</entry>
+ 	      <entry>0x2014</entry>
  	      <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>
+ 	      &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>
+ 	      <entry></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 --]

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
f71b10be4c8a ("of: Add vendor prefix for Arasan") from Linus' tree and
commit 5888f9df0dcd ("[media] of: Add vendor prefix for Aptina
Imaging") from the v4l-dvb tree.

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 Documentation/devicetree/bindings/vendor-prefixes.txt
index 3e8bd6d34c96,4326f52eba73..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -21,7 -20,7 +21,8 @@@ amlogic	Amlogic, Inc
  ams	AMS AG
  amstaos	AMS-Taos Inc.
  apm	Applied Micro Circuits Corporation (APM)
+ aptina	Aptina Imaging
 +arasan	Arasan Chip Systems
  arm	ARM Ltd.
  armadeus	ARMadeus Systems SARL
  asahi-kasei	Asahi Kasei Corp.

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

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/media/go7007/go7007-usb.c between commits 66a528c1c3d6
("Revert "staging:media: Use dev_dbg() instead of pr_debug()"") and
e6bbda9da9e8 ("Staging: go7007: fix up some remaining go->dev issues")
from Linus' tree and commit c61c3094a630 ("[media] go7007-usb: only use
go->dev after allocated") from the v4l-dvb tree.

I fixed it up (I basically used the version from the patches in Linus'
tree (they are in v3.13-rc2) - see below) and can carry the fix as necessary (no action is
required).

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

diff --cc drivers/staging/media/go7007/go7007-usb.c
index b658c2316df3,1d747de6dfa6..000000000000
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@@ -1099,13 -1097,16 +1099,15 @@@ static int go7007_usb_probe(struct usb_
  		board = &board_px_tv402u;
  		break;
  	case GO7007_BOARDID_LIFEVIEW_LR192:
 -		printk(KERN_ERR
 -		       "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
 +		dev_err(&intf->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
  		return -ENODEV;
+ #if 0
  		name = "Lifeview TV Walker Ultra";
  		board = &board_lifeview_lr192;
  		break;
+ #endif
  	case GO7007_BOARDID_SENSORAY_2250:
 -		printk(KERN_INFO "Sensoray 2250 found\n");
 +		dev_info(&intf->dev, "Sensoray 2250 found\n");
  		name = "Sensoray 2250/2251";
  		board = &board_sensoray_2250;
  		break;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-shmobile/board-bockw.c between commit fa3e0cee12fb ("ARM:
shmobile: BOCK-W: fix SDHI0 PFC settings") from Linus' tree and commit
9c43952d0f1e ("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667
support") from the v4l-dvb tree.

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 arch/arm/mach-shmobile/board-bockw.c
index 3354a85,7d44f66..0000000
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p
  				  "usb1", "usb1"),
  	/* SDHI0 */
  	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 -				  "sdhi0", "sdhi0"),
 +				  "sdhi0_data4", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_ctrl", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_cd", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_wp", "sdhi0"),
+ 	/* VIN0 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_clk", "vin0"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_data8", "vin0"),
+ 	/* VIN1 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_clk", "vin1"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_data8", "vin1"),
  };
  
  #define FPGA	0x18200000

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/feature-removal-schedule.txt between commit 9c0ece069b32
("Get rid of Documentation/feature-removal.txt") from Linus' tree and
commit 251658e5185e ("[media] Schedule removal of i.MX25 support in
mx2_camera.c") from the v4l-dvb tree.

I just removed the file and can carry the fix as necessary (no action
is required).

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Jiri Kosina]

On Tue, 19 Jun 2012, Hans de Goede wrote:

> > > diff --cc drivers/hid/hid-ids.h
> > > index 6d3037e,70298d1..0000000
> > > --- a/drivers/hid/hid-ids.h
> > > +++ b/drivers/hid/hid-ids.h
> > > @@@ -160,9 -157,9 +160,12 @@@
> > >    #define USB_VENDOR_ID_AVERMEDIA		0x07ca
> > >    #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
> > > 
> > > + #define USB_VENDOR_ID_AXENTIA		0x12cf
> > > + #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
> > > +
> > >   +#define USB_VENDOR_ID_BAANTO		0x2453
> > >   +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
> > >   +
> > >    #define USB_VENDOR_ID_BELKIN		0x050d
> > >    #define USB_DEVICE_ID_FLIP_KVM		0x3201
> > 
> > Thanks for reporting this, Stephen.
> > 
> > Hmmm ... Mauro, Hans, do you feel it's actually proper to add the device
> > ids to hid-ids.h? I am using this file usually solely for the drivers on
> > the HID bus, which radio-si470x is not, I believe.
> 
> Not sure what you mean with "drivers on the HID bus", radio-si470x drivers
> do use a USB-HID class interface, but the driver itself does not use
> the kernel hid framework. The ids in hid-ids are used for adding this device
> to the hid-core "blacklist" to avoid usb-hid from binding to it, so that
> radio-si470x-usn can bind to it.

Gah, sorry, ENOTENOUGHCOFFEE, I have missed that hunk. All is fine then.

-- 
Jiri Kosina
SUSE Labs

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

[Hans de Goede]

Hi,

On 06/19/2012 12:06 PM, Jiri Kosina wrote:
> On Tue, 19 Jun 2012, Stephen Rothwell wrote:
>
>> Hi Mauro,
>>
>> Today's linux-next merge of the v4l-dvb tree got a conflict in
>> drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
>> support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
>> ("[media] radio/si470x: Add support for the Axentia ALERT FM USB
>> Receiver") from the v4l-dvb tree.
>>
>> Just context changes.  I fixed it up (see below) and can carry the fix as
>> necessary.
>> --
>> Cheers,
>> Stephen Rothwell                    sfr@canb.auug.org.au
>>
>> diff --cc drivers/hid/hid-ids.h
>> index 6d3037e,70298d1..0000000
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@@ -160,9 -157,9 +160,12 @@@
>>    #define USB_VENDOR_ID_AVERMEDIA		0x07ca
>>    #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
>>
>> + #define USB_VENDOR_ID_AXENTIA		0x12cf
>> + #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
>> +
>>   +#define USB_VENDOR_ID_BAANTO		0x2453
>>   +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
>>   +
>>    #define USB_VENDOR_ID_BELKIN		0x050d
>>    #define USB_DEVICE_ID_FLIP_KVM		0x3201
>
> Thanks for reporting this, Stephen.
>
> Hmmm ... Mauro, Hans, do you feel it's actually proper to add the device
> ids to hid-ids.h? I am using this file usually solely for the drivers on
> the HID bus, which radio-si470x is not, I believe.

Not sure what you mean with "drivers on the HID bus", radio-si470x drivers
do use a USB-HID class interface, but the driver itself does not use
the kernel hid framework. The ids in hid-ids are used for adding this device
to the hid-core "blacklist" to avoid usb-hid from binding to it, so that
radio-si470x-usn can bind to it.

Regards,

Hans

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

[Jiri Kosina]

On Tue, 19 Jun 2012, Stephen Rothwell wrote:

> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
> support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
> ("[media] radio/si470x: Add support for the Axentia ALERT FM USB
> Receiver") from the v4l-dvb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/hid/hid-ids.h
> index 6d3037e,70298d1..0000000
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@@ -160,9 -157,9 +160,12 @@@
>   #define USB_VENDOR_ID_AVERMEDIA		0x07ca
>   #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
>   
> + #define USB_VENDOR_ID_AXENTIA		0x12cf
> + #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
> + 
>  +#define USB_VENDOR_ID_BAANTO		0x2453
>  +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
>  +
>   #define USB_VENDOR_ID_BELKIN		0x050d
>   #define USB_DEVICE_ID_FLIP_KVM		0x3201

Thanks for reporting this, Stephen.

Hmmm ... Mauro, Hans, do you feel it's actually proper to add the device 
ids to hid-ids.h? I am using this file usually solely for the drivers on 
the HID bus, which radio-si470x is not, I believe.

-- 
Jiri Kosina
SUSE Labs

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
("[media] radio/si470x: Add support for the Axentia ALERT FM USB
Receiver") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/hid/hid-ids.h
index 6d3037e,70298d1..0000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -160,9 -157,9 +160,12 @@@
  #define USB_VENDOR_ID_AVERMEDIA		0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
  
+ #define USB_VENDOR_ID_AXENTIA		0x12cf
+ #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
+ 
 +#define USB_VENDOR_ID_BAANTO		0x2453
 +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
 +
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

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

Hi Mauro,

On Fri, 29 Jul 2011 01:10:06 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Yeah, I prefer to base it at vanilla 3.0, instead of basing into a
> random point of the Linus tree. I should be submitting the patches
> tomorrow to Linus, after giving people some time to do some random
> builds with -next.

My build result will be here
http://kisskb.ellerman.id.au/kisskb/branch/9/ as they get done.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Mauro Carvalho Chehab]

Em 29-07-2011 00:17, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> arch/arm/mach-omap2/board-rx51-peripherals.c between commit 786b01a8c1db
> ("cleanup regulator supply definitions in mach-omap2") from Linus' tree
> and commit 75ccf268d504 ("[media] OMAP3: RX-51: define vdds_csib
> regulator supply") from the v4l-dvb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  I am sure
> Linus' will cope with this merge fixup as well, so you do not need to
> rebase/merge to his current tree before sending a pull request.

Thanks!

Yeah, I prefer to base it at vanilla 3.0, instead of basing into a
random point of the Linus tree. I should be submitting the patches
tomorrow to Linus, after giving people some time to do some random
builds with -next.

Mauro

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit 786b01a8c1db
("cleanup regulator supply definitions in mach-omap2") from Linus' tree
and commit 75ccf268d504 ("[media] OMAP3: RX-51: define vdds_csib
regulator supply") from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary.  I am sure
Linus' will cope with this merge fixup as well, so you do not need to
rebase/merge to his current tree before sending a pull request.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index cc503aa,17e5685..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -414,17 -358,17 +414,21 @@@ static struct omap2_hsmmc_info mmc[] __
  	{}	/* Terminator */
  };
  
 -static struct regulator_consumer_supply rx51_vmmc1_supply =
 -	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
 +static struct regulator_consumer_supply rx51_vmmc1_supply[] = {
 +	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
 +};
  
 -static struct regulator_consumer_supply rx51_vaux2_supply =
 -	REGULATOR_SUPPLY("vdds_csib", "omap3isp");
++static struct regulator_consumer_supply rx51_vaux2_supply[] = {
++	REGULATOR_SUPPLY("vdds_csib", "omap3isp"),
++};
+ 
 -static struct regulator_consumer_supply rx51_vaux3_supply =
 -	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vaux3_supply[] = {
 +	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
 +};
  
 -static struct regulator_consumer_supply rx51_vsim_supply =
 -	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vsim_supply[] = {
 +	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"),
 +};
  
  static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
  	/* tlv320aic3x analog supplies */
@@@ -479,6 -427,8 +483,8 @@@ static struct regulator_init_data rx51_
  		.valid_ops_mask		= REGULATOR_CHANGE_MODE
  					| REGULATOR_CHANGE_STATUS,
  	},
 -	.num_consumer_supplies	= 1,
 -	.consumer_supplies	= &rx51_vaux2_supply,
++	.num_consumer_supplies	= ARRAY_SIZE(rx51_vaux2_supply),
++	.consumer_supplies	= rx51_vaux2_supply,
  };
  
  /* VAUX3 - adds more power to VIO_18 rail */

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/frontends/drx397xD.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit a8e8541bc7af ("Remove
the now obsolete drx397xD") from the v4l-dvb tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/devices.c between commit 0abcf6185eb8 ("OMAP3:
devices: Initialise the l3 device with the hwmod data") from Linus' tree
and commit 5e1118fa89c7 ("[media] omap3: Add function to register
omap3isp platform device structure") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/devices.c
index d478f53,145c8f0..0000000
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -35,74 -33,12 +35,75 @@@
  
  #include "mux.h"
  #include "control.h"
 -
+ #include "devices.h"
  
 +#define L3_MODULES_MAX_LEN 12
 +#define L3_MODULES 3
 +
 +static int __init omap3_l3_init(void)
 +{
 +	int l;
 +	struct omap_hwmod *oh;
 +	struct omap_device *od;
 +	char oh_name[L3_MODULES_MAX_LEN];
 +
 +	/*
 +	 * To avoid code running on other OMAPs in
 +	 * multi-omap builds
 +	 */
 +	if (!(cpu_is_omap34xx()))
 +		return -ENODEV;
 +
 +	l = snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
 +
 +	oh = omap_hwmod_lookup(oh_name);
 +
 +	if (!oh)
 +		pr_err("could not look up %s\n", oh_name);
 +
 +	od = omap_device_build("omap_l3_smx", 0, oh, NULL, 0,
 +							   NULL, 0, 0);
 +
 +	WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 +
 +	return IS_ERR(od) ? PTR_ERR(od) : 0;
 +}
 +postcore_initcall(omap3_l3_init);
 +
 +static int __init omap4_l3_init(void)
 +{
 +	int l, i;
 +	struct omap_hwmod *oh[3];
 +	struct omap_device *od;
 +	char oh_name[L3_MODULES_MAX_LEN];
 +
 +	/*
 +	 * To avoid code running on other OMAPs in
 +	 * multi-omap builds
 +	 */
 +	if (!(cpu_is_omap44xx()))
 +		return -ENODEV;
 +
 +	for (i = 0; i < L3_MODULES; i++) {
 +		l = snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);
 +
 +		oh[i] = omap_hwmod_lookup(oh_name);
 +		if (!(oh[i]))
 +			pr_err("could not look up %s\n", oh_name);
 +	}
 +
 +	od = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL,
 +						     0, NULL, 0, 0);
 +
 +	WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
 +
 +	return PTR_ERR(od);
 +}
 +postcore_initcall(omap4_l3_init);
 +
  #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
  
- static struct resource cam_resources[] = {
+ static struct resource omap2cam_resources[] = {
  	{
  		.start		= OMAP24XX_CAMERA_BASE,
  		.end		= OMAP24XX_CAMERA_BASE + 0xfff,
@@@ -197,63 -142,92 +207,67 @@@ static struct platform_device omap3isp_
  	.resource	= omap3isp_resources,
  };
  
- static inline void omap_init_camera(void)
+ int omap3_init_camera(struct isp_platform_data *pdata)
  {
- 	platform_device_register(&omap3isp_device);
+ 	omap3isp_device.dev.platform_data = pdata;
+ 	return platform_device_register(&omap3isp_device);
  }
- #else
+ 
  static inline void omap_init_camera(void)
  {
- }
+ #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
+ 	if (cpu_is_omap24xx())
+ 		platform_device_register(&omap2cam_device);
  #endif
+ }
  
 -#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
 -
 -#define MBOX_REG_SIZE   0x120
 -
 -#ifdef CONFIG_ARCH_OMAP2
 -static struct resource omap2_mbox_resources[] = {
 -	{
 -		.start		= OMAP24XX_MAILBOX_BASE,
 -		.end		= OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
 -		.flags		= IORESOURCE_MEM,
 -	},
 +struct omap_device_pm_latency omap_keyboard_latency[] = {
  	{
 -		.start		= INT_24XX_MAIL_U0_MPU,
 -		.flags		= IORESOURCE_IRQ,
 -		.name		= "dsp",
 -	},
 -	{
 -		.start		= INT_24XX_MAIL_U3_MPU,
 -		.flags		= IORESOURCE_IRQ,
 -		.name		= "iva",
 +		.deactivate_func = omap_device_idle_hwmods,
 +		.activate_func   = omap_device_enable_hwmods,
 +		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
  	},
  };
 -static int omap2_mbox_resources_sz = ARRAY_SIZE(omap2_mbox_resources);
 -#else
 -#define omap2_mbox_resources		NULL
 -#define omap2_mbox_resources_sz		0
 -#endif
  
 -#ifdef CONFIG_ARCH_OMAP3
 -static struct resource omap3_mbox_resources[] = {
 -	{
 -		.start		= OMAP34XX_MAILBOX_BASE,
 -		.end		= OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
 -		.flags		= IORESOURCE_MEM,
 -	},
 -	{
 -		.start		= INT_24XX_MAIL_U0_MPU,
 -		.flags		= IORESOURCE_IRQ,
 -		.name		= "dsp",
 -	},
 -};
 -static int omap3_mbox_resources_sz = ARRAY_SIZE(omap3_mbox_resources);
 -#else
 -#define omap3_mbox_resources		NULL
 -#define omap3_mbox_resources_sz		0
 -#endif
 +int __init omap4_keyboard_init(struct omap4_keypad_platform_data
 +						*sdp4430_keypad_data)
 +{
 +	struct omap_device *od;
 +	struct omap_hwmod *oh;
 +	struct omap4_keypad_platform_data *keypad_data;
 +	unsigned int id = -1;
 +	char *oh_name = "kbd";
 +	char *name = "omap4-keypad";
 +
 +	oh = omap_hwmod_lookup(oh_name);
 +	if (!oh) {
 +		pr_err("Could not look up %s\n", oh_name);
 +		return -ENODEV;
 +	}
  
 -#ifdef CONFIG_ARCH_OMAP4
 +	keypad_data = sdp4430_keypad_data;
  
 -#define OMAP4_MBOX_REG_SIZE	0x130
 -static struct resource omap4_mbox_resources[] = {
 -	{
 -		.start          = OMAP44XX_MAILBOX_BASE,
 -		.end            = OMAP44XX_MAILBOX_BASE +
 -					OMAP4_MBOX_REG_SIZE - 1,
 -		.flags          = IORESOURCE_MEM,
 -	},
 -	{
 -		.start          = OMAP44XX_IRQ_MAIL_U0,
 -		.flags          = IORESOURCE_IRQ,
 -		.name		= "mbox",
 -	},
 -};
 -static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
 -#else
 -#define omap4_mbox_resources		NULL
 -#define omap4_mbox_resources_sz		0
 -#endif
 +	od = omap_device_build(name, id, oh, keypad_data,
 +			sizeof(struct omap4_keypad_platform_data),
 +			omap_keyboard_latency,
 +			ARRAY_SIZE(omap_keyboard_latency), 0);
  
 -static struct platform_device mbox_device = {
 -	.name		= "omap-mailbox",
 -	.id		= -1,
 +	if (IS_ERR(od)) {
 +		WARN(1, "Cant build omap_device for %s:%s.\n",
 +						name, oh->name);
 +		return PTR_ERR(od);
 +	}
 +
 +	return 0;
 +}
 +
 +#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
 +static struct omap_device_pm_latency mbox_latencies[] = {
 +	[0] = {
 +		.activate_func = omap_device_enable_hwmods,
 +		.deactivate_func = omap_device_idle_hwmods,
 +		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 +	},
  };
  
  static inline void omap_init_mbox(void)

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/tm6000/tm6000-alsa.c between commit
4ef09889d7b4c7be2aa3e132efb77029f51c95b7 ("v4l-dvb: update gfp/slab.h
includes") from Linus' tree and commit
813605a98db924123530784d29964e99a705482d ("tm6000-alsa: rework audio
buffer allocation/deallocation") from the v4l-dvb tree.

Just overlapping additions.  I fixed ti up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/tm6000/tm6000-alsa.c
index 273e26e,aa38577..0000000
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@@ -15,7 -15,7 +15,8 @@@
  #include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/usb.h>
 +#include <linux/slab.h>
+ #include <linux/vmalloc.h>
  
  #include <asm/delay.h>
  #include <sound/core.h>

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/input/evdev.c between commit
58b939959d228681208ba997595411fddc860849 ("Input: scancode in
get/set_keycodes should be unsigned") from Linus' tree and commit
edeada2cde748860846784cf3e5518d7c7c51ca2 ("V4L/DVB: input: Add support
for EVIO[CS]GKEYCODEBIG") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/evdev.c
index 2ee6c7a,1730b5b..0000000
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@@ -515,7 -513,9 +515,9 @@@ static long evdev_do_ioctl(struct file 
  	struct input_absinfo abs;
  	struct ff_effect effect;
  	int __user *ip = (int __user *)p;
+ 	struct keycode_table_entry kt, *kt_p = p;
+ 	char scancode[16];
 -	int i, t, u, v;
 +	unsigned int i, t, u, v;
  	int error;
  
  	switch (cmd) {

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

[Stephen Rothwell]

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

Hi Mauro,

On Tue, 11 May 2010 20:23:08 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Conflicts solved. They were generated by an upstream merge from
> my fixes tree.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

[Mauro Carvalho Chehab]

Hi Stephen,

Stephen Rothwell wrote:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/sn9c20x.c between commit
> a76b9f49ba58d081e373080ff75130673140d3f1 ("V4L/DVB: gspca - sn9c20x:
> Correct onstack wait_queue_head declaration") from Linus' tree and commit
> a0965d58c1aa34ab66f3e2b5abd770f18f393905 ("V4L/DVB: gspca - sn9c20x: use
> gspca's input device handling") from the v4l-dvb tree.
> 
> The latter just removed the code modified by the former.

Conflicts solved. They were generated by an upstream merge from
my fixes tree.

-- 

Cheers,
Mauro

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

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, May 10, 2010 6:03 AM
> To: Mauro Carvalho Chehab
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Guennadi
> Liakhovetski; Hiremath, Vaibhav
> Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree
> 
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/Makefile between commit
> b704e82a54591d69816b45f4324caf143f1a6fc8 ("V4L/DVB: V4L - Makfile:Removed
> duplicate entry of davinci") from Linus' tree and commit
> 3b5ce90284aff5f8683cfd08e0e1b38f73ad0aa8 ("V4L/DVB: V4L: SuperH Video
> Output Unit (VOU) driver") from the v4l-dvb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.
[Hiremath, Vaibhav] Thanks Stephen,

Looks ok to me.

Thanks,
Vaibhav

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/media/video/Makefile
> index c51c386,cc93859..0000000
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@@ -160,6 -166,10 +166,8 @@@ obj-$(CONFIG_VIDEO_MX3)			+=
> mx3_camera
>   obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
>   obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
> 
>  -obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
>  -
> + obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
> +
>   obj-$(CONFIG_VIDEO_AU0828) += au0828/
> 
>   obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/gspca/sn9c20x.c between commit
a76b9f49ba58d081e373080ff75130673140d3f1 ("V4L/DVB: gspca - sn9c20x:
Correct onstack wait_queue_head declaration") from Linus' tree and commit
a0965d58c1aa34ab66f3e2b5abd770f18f393905 ("V4L/DVB: gspca - sn9c20x: use
gspca's input device handling") from the v4l-dvb tree.

The latter just removed the code modified by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/Makefile between commit
b704e82a54591d69816b45f4324caf143f1a6fc8 ("V4L/DVB: V4L - Makfile:Removed
duplicate entry of davinci") from Linus' tree and commit
3b5ce90284aff5f8683cfd08e0e1b38f73ad0aa8 ("V4L/DVB: V4L: SuperH Video
Output Unit (VOU) driver") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/Makefile
index c51c386,cc93859..0000000
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@@ -160,6 -166,10 +166,8 @@@ obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera
  obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
  obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
  
 -obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
 -
+ obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
+ 
  obj-$(CONFIG_VIDEO_AU0828) += au0828/
  
  obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/

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

[Stephen Rothwell]

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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/ttpci/budget.c between commit
6f550dc08369ee0bc6402963c377e65f0f2e3b71 ("V4L/DVB: budget: Oops: "BUG:
unable to handle kernel NULL pointer 	dereference"") from Linus'
tree and commit 2bf92108b679637c2e50114f4c655d7cc608a1d9 ("[v2, for,
v4l-dvb, 	master] V4L/DVB: budget: Oops: "BUG: unable to handle
kernel NULL 	pointer dereference"") from the v4l-dvb tree.

I just used the version of that file from the v4l-dvb tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

[Stephen Rothwell]

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

Hi Mauro,

On Fri, 09 Apr 2010 02:22:29 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Thanks for pointing it to me. Fixed.
> 
> I also fixed today a conflict that it would appear on your next pull, between 
> input and v4l-dvb, due to the upstream changes of keytable ops from
> int to unsigned.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

[Mauro Carvalho Chehab]

Hi Stephen,

Stephen Rothwell wrote:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/meye.c between commit
> 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
> and slab.h includes to prepare for breaking implicit slab.h inclusion
> from percpu.h") from Linus' tree and commit
> b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last
> V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the change
> for a while.

Thanks for pointing it to me. Fixed.

I also fixed today a conflict that it would appear on your next pull, between 
input and v4l-dvb, due to the upstream changes of keytable ops from
int to unsigned.

-- 

Cheers,
Mauro

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/meye.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last
V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the change
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/meye.c
index 4404e5e,9c7f282..0000000
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@@ -30,9 -30,9 +30,10 @@@
  #include <linux/pci.h>
  #include <linux/sched.h>
  #include <linux/init.h>
- #include <linux/videodev.h>
+ #include <linux/videodev2.h>
 +#include <linux/gfp.h>
  #include <media/v4l2-common.h>
+ #include <media/v4l2-device.h>
  #include <media/v4l2-ioctl.h>
  #include <asm/uaccess.h>
  #include <asm/io.h>

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

[Stephen Rothwell]

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

Hi Mauro,

On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab <maurochehab@gmail.com> wrote:
>
> I've rebased it to fix this merge conflict between my devel tree and upstream.
> You probably can drop it on your next merge.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Mauro Carvalho Chehab]

Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/Kconfig between commit
> b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
> sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
> 7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
> gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
> v4l-dvb tree.
> 
> I fixed it up (see below) and will carry the fix for a while.

Thanks.

I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.



Atenciosamente,
Prof. Mauro Carvalho Chehab, MSc, CISSP
maurochehab@gmail.com

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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/gspca/Kconfig between commit
b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
v4l-dvb tree.

I fixed it up (see below) and will carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/gspca/Kconfig
index e994dca,6ae1522..0000000
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@@ -113,10 -122,10 +122,10 @@@ config USB_GSPCA_SN9C20
  	 module will be called gspca_sn9c20x.
  
  config USB_GSPCA_SN9C20X_EVDEV
-        bool "Enable evdev support"
+ 	bool "Enable evdev support"
 -	depends on USB_GSPCA_SN9C20X
 +	depends on USB_GSPCA_SN9C20X && INPUT
-        ---help---
- 	 Say Y here in order to enable evdev support for sn9c20x webcam button.
+ 	---help---
+ 	  Say Y here in order to enable evdev support for sn9c20x webcam button.
  
  config USB_GSPCA_SONIXB
  	tristate "SONIX Bayer USB Camera Driver"