[GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Guennadi Liakhovetski]

Hi Mauro,

I was waiting for DT patches for soc-camera, but they're not yet ready. 
So, here go 5 patches, including one driver removal, one error-path fix 
from myself, and a couple more clean up and enhancement patches.

BTW, the "git request-pull" command issued a warning:

warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
warn: Are you sure you pushed 'HEAD' there?

I hope, the result is still ok...

The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:

  Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)

are available in the git repository at:

  git://linuxtv.org/gliakhovetski/v4l-dvb.git 

for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:

  media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)

----------------------------------------------------------------
Alexander Shiyan (2):
      media: mx1_camera: Remove driver
      media: mx2_camera: Change Kconfig dependency

Ben Dooks (1):
      rcar_vin: copy flags from pdata

Guennadi Liakhovetski (1):
      V4L: soc-camera: explicitly free allocated managed memory on error

Jean Delvare (1):
      V4L2: soc_camera: add run-time dependencies to R-Car VIN driver

 drivers/media/platform/soc_camera/Kconfig      |  16 +-
 drivers/media/platform/soc_camera/Makefile     |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
 drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
 drivers/media/platform/soc_camera/soc_camera.c |  12 +-
 5 files changed, 16 insertions(+), 891 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c

Thanks
Guennadi

Re: [GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Mauro Carvalho Chehab]

Hi Guennadi,

Em Sat, 24 May 2014 13:31:37 +0200 (CEST)
Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:

> Hi Mauro,
> 
> I was waiting for DT patches for soc-camera, but they're not yet ready. 
> So, here go 5 patches, including one driver removal, one error-path fix 
> from myself, and a couple more clean up and enhancement patches.
> 
> BTW, the "git request-pull" command issued a warning:
> 
> warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
> warn: Are you sure you pushed 'HEAD' there?

This is actually a fatal error... you forgot to do a git pull ;)

> 
> I hope, the result is still ok...
> 
> The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:
> 
>   Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)
> 
> are available in the git repository at:
> 
>   git://linuxtv.org/gliakhovetski/v4l-dvb.git 

See, the URL above doesn't have a branch. That's because git request-pull
were unable to find a branch upstream with your patches.

> 
> for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:
> 
>   media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)
> 
> ----------------------------------------------------------------
> Alexander Shiyan (2):
>       media: mx1_camera: Remove driver
>       media: mx2_camera: Change Kconfig dependency
> 
> Ben Dooks (1):
>       rcar_vin: copy flags from pdata
> 
> Guennadi Liakhovetski (1):
>       V4L: soc-camera: explicitly free allocated managed memory on error
> 
> Jean Delvare (1):
>       V4L2: soc_camera: add run-time dependencies to R-Car VIN driver
> 
>  drivers/media/platform/soc_camera/Kconfig      |  16 +-
>  drivers/media/platform/soc_camera/Makefile     |   1 -
>  drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
>  drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
>  drivers/media/platform/soc_camera/soc_camera.c |  12 +-
>  5 files changed, 16 insertions(+), 891 deletions(-)
>  delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
> 
> Thanks
> Guennadi
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Guennadi Liakhovetski]

On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:

> Hi Guennadi,
> 
> Em Sat, 24 May 2014 13:31:37 +0200 (CEST)
> Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> 
> > Hi Mauro,
> > 
> > I was waiting for DT patches for soc-camera, but they're not yet ready. 
> > So, here go 5 patches, including one driver removal, one error-path fix 
> > from myself, and a couple more clean up and enhancement patches.
> > 
> > BTW, the "git request-pull" command issued a warning:
> > 
> > warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
> > warn: Are you sure you pushed 'HEAD' there?
> 
> This is actually a fatal error... you forgot to do a git pull ;)

Uhm... never had to do it before... I still couldn't generate a pull 
request properly, I only managed to do it after I specified an end hash... 
So, here's a new version:

The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:

  Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)

are available in the git repository at:

  git://linuxtv.org/gliakhovetski/v4l-dvb.git 66635afdc4e26f89fd7bc631f452ada84d6e4f3f

for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:

  media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)

----------------------------------------------------------------
Alexander Shiyan (2):
      media: mx1_camera: Remove driver
      media: mx2_camera: Change Kconfig dependency

Ben Dooks (1):
      rcar_vin: copy flags from pdata

Guennadi Liakhovetski (1):
      V4L: soc-camera: explicitly free allocated managed memory on error

Jean Delvare (1):
      V4L2: soc_camera: add run-time dependencies to R-Car VIN driver

 drivers/media/platform/soc_camera/Kconfig      |  16 +-
 drivers/media/platform/soc_camera/Makefile     |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
 drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
 drivers/media/platform/soc_camera/soc_camera.c |  12 +-
 5 files changed, 16 insertions(+), 891 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c

Re: [GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Mauro Carvalho Chehab]

Em Sun, 25 May 2014 20:05:49 +0200 (CEST)
Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:

> On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:
> 
> > Hi Guennadi,
> > 
> > Em Sat, 24 May 2014 13:31:37 +0200 (CEST)
> > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> > 
> > > Hi Mauro,
> > > 
> > > I was waiting for DT patches for soc-camera, but they're not yet ready. 
> > > So, here go 5 patches, including one driver removal, one error-path fix 
> > > from myself, and a couple more clean up and enhancement patches.
> > > 
> > > BTW, the "git request-pull" command issued a warning:
> > > 
> > > warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
> > > warn: Are you sure you pushed 'HEAD' there?
> > 
> > This is actually a fatal error... you forgot to do a git pull ;)
> 
> Uhm... never had to do it before... I still couldn't generate a pull 
> request properly, I only managed to do it after I specified an end hash... 
> So, here's a new version:
> 
> The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:
> 
>   Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)
> 
> are available in the git repository at:
> 
>   git://linuxtv.org/gliakhovetski/v4l-dvb.git 66635afdc4e26f89fd7bc631f452ada84d6e4f3f

That doesn't work properly.

Also, it seems that there's something wrong on your tree, as there are
there even patches for linux-next:
http://git.linuxtv.org/cgit.cgi/gliakhovetski/v4l-dvb.git/log/?h=for-3.16-1

You should not send me a pull request based on linux-next, as this will
break compilation.

Instead, if you're needing patches merged via other trees, please
explicitly tell be, and I'll create a separate topic branch, pushing
there from the other maintainer's tree. Of course, in this case, it
should be a branch that the other maintainer will never rebase.

I did something similar to that today, with the OMAP3 patches from
Laurent.

Regards,
Mauro
> 
> for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:
> 
>   media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)
> 
> ----------------------------------------------------------------
> Alexander Shiyan (2):
>       media: mx1_camera: Remove driver
>       media: mx2_camera: Change Kconfig dependency
> 
> Ben Dooks (1):
>       rcar_vin: copy flags from pdata
> 
> Guennadi Liakhovetski (1):
>       V4L: soc-camera: explicitly free allocated managed memory on error
> 
> Jean Delvare (1):
>       V4L2: soc_camera: add run-time dependencies to R-Car VIN driver
> 
>  drivers/media/platform/soc_camera/Kconfig      |  16 +-
>  drivers/media/platform/soc_camera/Makefile     |   1 -
>  drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
>  drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
>  drivers/media/platform/soc_camera/soc_camera.c |  12 +-
>  5 files changed, 16 insertions(+), 891 deletions(-)
>  delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c

Re: [GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Guennadi Liakhovetski]

On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:

> Em Sun, 25 May 2014 20:05:49 +0200 (CEST)
> Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> 
> > On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:
> > 
> > > Hi Guennadi,
> > > 
> > > Em Sat, 24 May 2014 13:31:37 +0200 (CEST)
> > > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> > > 
> > > > Hi Mauro,
> > > > 
> > > > I was waiting for DT patches for soc-camera, but they're not yet ready. 
> > > > So, here go 5 patches, including one driver removal, one error-path fix 
> > > > from myself, and a couple more clean up and enhancement patches.
> > > > 
> > > > BTW, the "git request-pull" command issued a warning:
> > > > 
> > > > warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
> > > > warn: Are you sure you pushed 'HEAD' there?
> > > 
> > > This is actually a fatal error... you forgot to do a git pull ;)
> > 
> > Uhm... never had to do it before... I still couldn't generate a pull 
> > request properly, I only managed to do it after I specified an end hash... 
> > So, here's a new version:
> > 
> > The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:
> > 
> >   Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)
> > 
> > are available in the git repository at:
> > 
> >   git://linuxtv.org/gliakhovetski/v4l-dvb.git 66635afdc4e26f89fd7bc631f452ada84d6e4f3f
> 
> That doesn't work properly.

Hm... Why? You mean you cannot pull it like that?

> Also, it seems that there's something wrong on your tree, as there are
> there even patches for linux-next:
> http://git.linuxtv.org/cgit.cgi/gliakhovetski/v4l-dvb.git/log/?h=for-3.16-1

I always did that, see e.g. 
http://git.linuxtv.org/cgit.cgi/gliakhovetski/v4l-dvb.git/log/?h=for-3.15-1

> You should not send me a pull request based on linux-next, as this will
> break compilation.

Why _will_ it break compilation? I thought, since I specify the beginning 
commit in my pull request, you only pull commits _after_ that upstream 
base point, so, it doesn't matter much for you on which tree I base my 
branch, it's just my responsibility to (reasonably) make sure, that my 
patches also apply to your tree. So I always just used next, as it is 
supposed to also include your development branch. Should I explicitly 
base my branches on your next branch instead?

> Instead, if you're needing patches merged via other trees, please
> explicitly tell be, and I'll create a separate topic branch, pushing
> there from the other maintainer's tree. Of course, in this case, it
> should be a branch that the other maintainer will never rebase.
> 
> I did something similar to that today, with the OMAP3 patches from
> Laurent.

No, no specific need, just the usual procedure.

Thanks
Guennadi

> 
> Regards,
> Mauro
> > 
> > for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:
> > 
> >   media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)
> > 
> > ----------------------------------------------------------------
> > Alexander Shiyan (2):
> >       media: mx1_camera: Remove driver
> >       media: mx2_camera: Change Kconfig dependency
> > 
> > Ben Dooks (1):
> >       rcar_vin: copy flags from pdata
> > 
> > Guennadi Liakhovetski (1):
> >       V4L: soc-camera: explicitly free allocated managed memory on error
> > 
> > Jean Delvare (1):
> >       V4L2: soc_camera: add run-time dependencies to R-Car VIN driver
> > 
> >  drivers/media/platform/soc_camera/Kconfig      |  16 +-
> >  drivers/media/platform/soc_camera/Makefile     |   1 -
> >  drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
> >  drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
> >  drivers/media/platform/soc_camera/soc_camera.c |  12 +-
> >  5 files changed, 16 insertions(+), 891 deletions(-)
> >  delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
> 

Re: [GIT PULL 3.16] soc-camera for 3.16: one driver removal, a fix and more

[Mauro Carvalho Chehab]

Em Sun, 25 May 2014 21:33:06 +0200 (CEST)
Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:

> On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:
> 
> > Em Sun, 25 May 2014 20:05:49 +0200 (CEST)
> > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> > 
> > > On Sun, 25 May 2014, Mauro Carvalho Chehab wrote:
> > > 
> > > > Hi Guennadi,
> > > > 
> > > > Em Sat, 24 May 2014 13:31:37 +0200 (CEST)
> > > > Guennadi Liakhovetski <g.liakhovetski@gmx.de> escreveu:
> > > > 
> > > > > Hi Mauro,
> > > > > 
> > > > > I was waiting for DT patches for soc-camera, but they're not yet ready. 
> > > > > So, here go 5 patches, including one driver removal, one error-path fix 
> > > > > from myself, and a couple more clean up and enhancement patches.
> > > > > 
> > > > > BTW, the "git request-pull" command issued a warning:
> > > > > 
> > > > > warn: No match for commit 66635afdc4e26f89fd7bc631f452ada84d6e4f3f found at git://linuxtv.org/gliakhovetski/v4l-dvb.git
> > > > > warn: Are you sure you pushed 'HEAD' there?
> > > > 
> > > > This is actually a fatal error... you forgot to do a git pull ;)
> > > 
> > > Uhm... never had to do it before... I still couldn't generate a pull 
> > > request properly, I only managed to do it after I specified an end hash... 
> > > So, here's a new version:
> > > 
> > > The following changes since commit b5c8d48bf8f4273a9fe680bd834f991005c8ab59:
> > > 
> > >   Add linux-next specific files for 20140502 (2014-05-02 17:01:07 +1000)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://linuxtv.org/gliakhovetski/v4l-dvb.git 66635afdc4e26f89fd7bc631f452ada84d6e4f3f
> > 
> > That doesn't work properly.
> 
> Hm... Why? You mean you cannot pull it like that?

Well, git fetch didn't like that, causing my scripts to break. There are
some git commands that don't work with a hash. They require a tag
or branch to succeed.

> 
> > Also, it seems that there's something wrong on your tree, as there are
> > there even patches for linux-next:
> > http://git.linuxtv.org/cgit.cgi/gliakhovetski/v4l-dvb.git/log/?h=for-3.16-1
> 
> I always did that, see e.g. 
> http://git.linuxtv.org/cgit.cgi/gliakhovetski/v4l-dvb.git/log/?h=for-3.15-1

Well, there, the last changeset is: 36771b8e0770a327eade28ac16a5f9760d76b86e
and not 66635afdc4e26f89fd7bc631f452ada84d6e4f3f.

> > You should not send me a pull request based on linux-next, as this will
> > break compilation.
> 
> Why _will_ it break compilation? 

Well, because the patches on your tree can be relying on some upstream
patch, or, putting it into other words: you didn't test compiling them
against upstream.

> I thought, since I specify the beginning 
> commit in my pull request, you only pull commits _after_ that upstream 
> base point, so, it doesn't matter much for you on which tree I base my 
> branch, it's just my responsibility to (reasonably) make sure, that my 
> patches also apply to your tree. 

That's only true if my scripts can properly parse your email, as the
logic for cherry-picking the patches in this case is somewhat complex,
and require both the initial changeset and the final tag or branch.

> So I always just used next, as it is 
> supposed to also include your development branch. Should I explicitly 
> base my branches on your next branch instead?

Please base your tree either on Linus tree (or some already upstreamed
branch) or in my tree.

This way, I won't complain with you when I push it on my -next tree.

One step I always do before merging things at my next tree is to compile
on ~45 different archs. I don't do it patch by patch, as such compilation
takes ~1 hour.

> 
> > Instead, if you're needing patches merged via other trees, please
> > explicitly tell be, and I'll create a separate topic branch, pushing
> > there from the other maintainer's tree. Of course, in this case, it
> > should be a branch that the other maintainer will never rebase.
> > 
> > I did something similar to that today, with the OMAP3 patches from
> > Laurent.
> 
> No, no specific need, just the usual procedure.

Ah, ok. I was guessing that you were needing something special, doing it
based on -next, instead of based on upstream.

> Thanks
> Guennadi
> 
> > 
> > Regards,
> > Mauro
> > > 
> > > for you to fetch changes up to 66635afdc4e26f89fd7bc631f452ada84d6e4f3f:
> > > 
> > >   media: mx2_camera: Change Kconfig dependency (2014-05-24 13:08:53 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > Alexander Shiyan (2):
> > >       media: mx1_camera: Remove driver
> > >       media: mx2_camera: Change Kconfig dependency
> > > 
> > > Ben Dooks (1):
> > >       rcar_vin: copy flags from pdata
> > > 
> > > Guennadi Liakhovetski (1):
> > >       V4L: soc-camera: explicitly free allocated managed memory on error
> > > 
> > > Jean Delvare (1):
> > >       V4L2: soc_camera: add run-time dependencies to R-Car VIN driver
> > > 
> > >  drivers/media/platform/soc_camera/Kconfig      |  16 +-
> > >  drivers/media/platform/soc_camera/Makefile     |   1 -
> > >  drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
> > >  drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
> > >  drivers/media/platform/soc_camera/soc_camera.c |  12 +-
> > >  5 files changed, 16 insertions(+), 891 deletions(-)
> > >  delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
> >