Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.

Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.

[Jonathan Corbet]

On Fri, 28 Sep 2012 13:26:39 +0200
Javier Martin <javier.martin@vista-silicon.com> wrote:

> The following series migrate ov7670 sensor and current users to ctrl framework
> as  discussed in [1]. This has been tested against mx2_camera soc-camera bridge,
> so tests or acks will be required from people using cam-core and via-camera out
> there.

Looking over the code, I can't really find much to get grumpy about.
Certainly I like how it removes more code than it adds.  I'm not really
up on the control framework, though.  What's really needed is to see
this code actually work on the relevant systems.  I will *try* to do
that testing, but it's going to take a little while; I don't think I
can do it by the 3.7 merge window.  Mauro willing, perhaps it can go in
this time around anyway with the idea that we can sort out any little
difficulties after -rc1.

jon

Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.

[javier Martin]

Hi Mauro, Jon,
any more issues related with this series?

Regards.

On 29 September 2012 21:25, Jonathan Corbet <corbet@lwn.net> wrote:
> On Fri, 28 Sep 2012 13:26:39 +0200
> Javier Martin <javier.martin@vista-silicon.com> wrote:
>
>> The following series migrate ov7670 sensor and current users to ctrl framework
>> as  discussed in [1]. This has been tested against mx2_camera soc-camera bridge,
>> so tests or acks will be required from people using cam-core and via-camera out
>> there.
>
> Looking over the code, I can't really find much to get grumpy about.
> Certainly I like how it removes more code than it adds.  I'm not really
> up on the control framework, though.  What's really needed is to see
> this code actually work on the relevant systems.  I will *try* to do
> that testing, but it's going to take a little while; I don't think I
> can do it by the 3.7 merge window.  Mauro willing, perhaps it can go in
> this time around anyway with the idea that we can sort out any little
> difficulties after -rc1.
>
> jon



-- 
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com

Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.

[Mauro Carvalho Chehab]

Hi Javier,

Em Thu, 25 Oct 2012 15:27:08 +0200
javier Martin <javier.martin@vista-silicon.com> escreveu:

> Hi Mauro, Jon,
> any more issues related with this series?

Patch doesn't apply anymore:

patching file drivers/media/i2c/ov7670.c
Hunk #2 succeeded at 191 (offset -32 lines).
Hunk #3 succeeded at 220 (offset -35 lines).
Hunk #4 succeeded at 1062 (offset -153 lines).
Hunk #5 succeeded at 1091 (offset -153 lines).
Hunk #6 succeeded at 1127 (offset -153 lines).
Hunk #7 succeeded at 1147 (offset -153 lines).
Hunk #8 succeeded at 1195 (offset -153 lines).
Hunk #9 succeeded at 1211 (offset -153 lines).
Hunk #10 succeeded at 1237 (offset -153 lines).
Hunk #11 succeeded at 1255 (offset -153 lines).
Hunk #12 succeeded at 1351 (offset -153 lines).
Hunk #13 FAILED at 1605.
Hunk #14 FAILED at 1616.
Hunk #15 succeeded at 1434 (offset -189 lines).
2 out of 15 hunks FAILED -- rejects in file drivers/media/i2c/ov7670.c

Could you please rebase it? I tried to force its merge, but
it seemed that the conflicts are not that trivial, so I prefer
if you could do it and test if everything still applies.

Regards,
Mauro
-- 
Regards,
Mauro

Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.

[javier Martin]

Hi Mauro,


On 25 October 2012 17:50, Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
> Hi Javier,
>
> Em Thu, 25 Oct 2012 15:27:08 +0200
> javier Martin <javier.martin@vista-silicon.com> escreveu:
>
>> Hi Mauro, Jon,
>> any more issues related with this series?
>
> Patch doesn't apply anymore:
>
> patching file drivers/media/i2c/ov7670.c
> Hunk #2 succeeded at 191 (offset -32 lines).
> Hunk #3 succeeded at 220 (offset -35 lines).
> Hunk #4 succeeded at 1062 (offset -153 lines).
> Hunk #5 succeeded at 1091 (offset -153 lines).
> Hunk #6 succeeded at 1127 (offset -153 lines).
> Hunk #7 succeeded at 1147 (offset -153 lines).
> Hunk #8 succeeded at 1195 (offset -153 lines).
> Hunk #9 succeeded at 1211 (offset -153 lines).
> Hunk #10 succeeded at 1237 (offset -153 lines).
> Hunk #11 succeeded at 1255 (offset -153 lines).
> Hunk #12 succeeded at 1351 (offset -153 lines).
> Hunk #13 FAILED at 1605.
> Hunk #14 FAILED at 1616.
> Hunk #15 succeeded at 1434 (offset -189 lines).
> 2 out of 15 hunks FAILED -- rejects in file drivers/media/i2c/ov7670.c
>
> Could you please rebase it? I tried to force its merge, but
> it seemed that the conflicts are not that trivial, so I prefer
> if you could do it and test if everything still applies.

You need to apply the series in the following order:

Firstly: [PATCH v2 0/5] media: ov7670: driver cleanup and support for ov7674.
Secondly: [PATCH v3 0/4] ov7670: migrate this sensor and its users to
ctrl framework.

This shouldn't cause any troubles. Otherwise, please let me know.

Regards.

-- 
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com