mbox

[GIT,PATCHES,FOR,3.4] gspca for_v3.4

Message ID 20120227130606.1f432e7b@tele (mailing list archive)
State Accepted, archived
Headers

Pull-request

git://linuxtv.org/jfrancois/gspca.git for_v3.4

Message

Jean-Francois Moine Feb. 27, 2012, 12:06 p.m. UTC 
  The following changes since commit a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e:

  [media] xc5000: declare firmware configuration structures as static const (2012-02-14 17:22:46 -0200)

are available in the git repository at:

  git://linuxtv.org/jfrancois/gspca.git for_v3.4

for you to fetch changes up to 1b9ace2d5769c1676c96a6dc70ea84d2dea17140:

  gspca - zc3xx: Set the exposure at start of hv7131r (2012-02-27 12:49:49 +0100)

----------------------------------------------------------------
Jean-François Moine (13):
      gspca - pac7302: Add new webcam 06f8:301b
      gspca - pac7302: Cleanup source
      gspca - pac7302: Simplify the function pkt_scan
      gspca - pac7302: Use the new video control mechanism
      gspca - pac7302: Do autogain setting work
      gspca - sonixj: Remove the jpeg control
      gspca - sonixj: Add exposure, gain and auto exposure for po2030n
      gspca - zc3xx: Adjust the JPEG decompression tables
      gspca - zc3xx: Do automatic transfer control for hv7131r and pas202b
      gspca - zc3xx: Remove the low level traces
      gspca - zc3xx: Cleanup source
      gspca - zc3xx: Fix bad sensor values when changing autogain
      gspca - zc3xx: Set the exposure at start of hv7131r

 Documentation/video4linux/gspca.txt |    1 +
 drivers/media/video/gspca/pac7302.c |  583 ++++++++++-------------------------
 drivers/media/video/gspca/sonixj.c  |  185 +++++++++---
 drivers/media/video/gspca/zc3xx.c   |  295 ++++++++++++------
 4 files changed, 511 insertions(+), 553 deletions(-)

Comments

Sylwester Nawrocki Feb. 27, 2012, 8:01 p.m. UTC | #1 
Hi Jean-François,

On 02/27/2012 01:06 PM, Jean-Francois Moine wrote:
> The following changes since commit a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e:
> 
>    [media] xc5000: declare firmware configuration structures as static const (2012-02-14 17:22:46 -0200)
> 
> are available in the git repository at:
> 
>    git://linuxtv.org/jfrancois/gspca.git for_v3.4
> 
> for you to fetch changes up to 1b9ace2d5769c1676c96a6dc70ea84d2dea17140:
> 
>    gspca - zc3xx: Set the exposure at start of hv7131r (2012-02-27 12:49:49 +0100)
> 
> ----------------------------------------------------------------
> Jean-François Moine (13):
>        gspca - pac7302: Add new webcam 06f8:301b
>        gspca - pac7302: Cleanup source
>        gspca - pac7302: Simplify the function pkt_scan
>        gspca - pac7302: Use the new video control mechanism
>        gspca - pac7302: Do autogain setting work
>        gspca - sonixj: Remove the jpeg control
>        gspca - sonixj: Add exposure, gain and auto exposure for po2030n
>        gspca - zc3xx: Adjust the JPEG decompression tables

This patch will conflict with patch:

 gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support

from my recent pull request http://patchwork.linuxtv.org/patch/10022/

How should we proceed with that ? Do you want me to remove the above patch 
from my pull request, or would you rebase your change set on top of mine ?

--
Best regards,
Sylwester

>        gspca - zc3xx: Do automatic transfer control for hv7131r and pas202b
>        gspca - zc3xx: Remove the low level traces
>        gspca - zc3xx: Cleanup source
>        gspca - zc3xx: Fix bad sensor values when changing autogain
>        gspca - zc3xx: Set the exposure at start of hv7131r
> 
>   Documentation/video4linux/gspca.txt |    1 +
>   drivers/media/video/gspca/pac7302.c |  583 ++++++++++-------------------------
>   drivers/media/video/gspca/sonixj.c  |  185 +++++++++---
>   drivers/media/video/gspca/zc3xx.c   |  295 ++++++++++++------
>   4 files changed, 511 insertions(+), 553 deletions(-)
> 

--
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
Jean-Francois Moine Feb. 28, 2012, 11:05 a.m. UTC | #2 
On Mon, 27 Feb 2012 21:01:21 +0100
Sylwester Nawrocki <snjw23@gmail.com> wrote:

> This patch will conflict with patch:
> 
>  gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support
> 
> from my recent pull request http://patchwork.linuxtv.org/patch/10022/
> 
> How should we proceed with that ? Do you want me to remove the above patch 
> from my pull request, or would you rebase your change set on top of mine ?

Hi Sylwester,

Sorry for the problem, I thought your patch was already in the media
tree.

I checked the changes in zc3xx.c, and I have made many commits. So, it
would be simpler if you would remove your patch. I could give you a
merged one once the media tree would be updated.

Best regards.
Sylwester Nawrocki Feb. 28, 2012, 11:15 a.m. UTC | #3 
Hi Jean-Francois,

On 02/28/2012 12:05 PM, Jean-Francois Moine wrote:
> On Mon, 27 Feb 2012 21:01:21 +0100
> Sylwester Nawrocki <snjw23@gmail.com> wrote:
> 
>> This patch will conflict with patch:
>>
>>  gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support
>>
>> from my recent pull request http://patchwork.linuxtv.org/patch/10022/
>>
>> How should we proceed with that ? Do you want me to remove the above patch 
>> from my pull request, or would you rebase your change set on top of mine ?
> 
> Hi Sylwester,
> 
> Sorry for the problem, I thought your patch was already in the media
> tree.

Sorry about the delay, I was holding on for quite some time with pushing
the patch upstream.

> I checked the changes in zc3xx.c, and I have made many commits. So, it
> would be simpler if you would remove your patch. I could give you a
> merged one once the media tree would be updated.

OK, if it's easier please carry the patch in your tree. Otherwise, let me
handle it after our pull request are included in the media tree.

Best regards,