All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sylwester Nawrocki <snjw23@gmail.com>
To: Jean-Francois Moine <moinejf@free.fr>
Cc: linux-media@vger.kernel.org
Subject: Re: [GIT PATCHES FOR 3.4] gspca for_v3.4
Date: Mon, 27 Feb 2012 21:01:21 +0100	[thread overview]
Message-ID: <4F4BE111.6090805@gmail.com> (raw)
In-Reply-To: <20120227130606.1f432e7b@tele>

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(-)
> 


  reply	other threads:[~2012-02-27 20:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-27 12:06 [GIT PATCHES FOR 3.4] gspca for_v3.4 Jean-Francois Moine
2012-02-27 20:01 ` Sylwester Nawrocki [this message]
2012-02-28 11:05   ` Jean-Francois Moine
2012-02-28 11:15     ` Sylwester Nawrocki
     [not found]       ` <20120310123901.72aaa060@tele>
2012-03-10 19:24         ` Sylwester Nawrocki
  -- strict thread matches above, loose matches on Subject: below --
2012-03-19  8:24 Jean-Francois Moine
2012-03-24 18:15 Jean-Francois Moine
2012-05-02  7:12 Jean-Francois Moine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F4BE111.6090805@gmail.com \
    --to=snjw23@gmail.com \
    --cc=linux-media@vger.kernel.org \
    --cc=moinejf@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.