[GIT,PATCHES,FOR,3.4] gspca for_v3.4
Message ID | 20120227130606.1f432e7b@tele (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1S1zJw-0008Lo-Ea for patchwork@linuxtv.org; Mon, 27 Feb 2012 13:04:48 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for <patchwork@linuxtv.org> id 1S1zJv-00023J-Bp; Mon, 27 Feb 2012 13:04:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881Ab2B0MEp (ORCPT <rfc822;patchwork@linuxtv.org>); Mon, 27 Feb 2012 07:04:45 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:48995 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752766Ab2B0MEo convert rfc822-to-8bit (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 27 Feb 2012 07:04:44 -0500 Received: from tele (unknown [IPv6:2a01:e35:2f5c:9de0:212:bfff:fe1e:9ce4]) by smtp1-g21.free.fr (Postfix) with ESMTP id 59E72940182 for <linux-media@vger.kernel.org>; Mon, 27 Feb 2012 13:04:35 +0100 (CET) Date: Mon, 27 Feb 2012 13:06:06 +0100 From: Jean-Francois Moine <moinejf@free.fr> To: linux-media@vger.kernel.org Subject: [GIT PATCHES FOR 3.4] gspca for_v3.4 Message-ID: <20120227130606.1f432e7b@tele> X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.2.27.114814 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' |
Pull-request
git://linuxtv.org/jfrancois/gspca.git for_v3.4Message
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
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
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.
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,