From: Jean-Francois Moine <moinejf@free.fr>
To: linux-media@vger.kernel.org
Subject: Re: [GIT PATCHES FOR 3.4] gspca for_v3.4
Date: Tue, 28 Feb 2012 12:05:48 +0100 [thread overview]
Message-ID: <20120228120548.186ee4bc@tele> (raw)
In-Reply-To: <4F4BE111.6090805@gmail.com>
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.
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
next prev parent reply other threads:[~2012-02-28 11:04 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
2012-02-28 11:05 ` Jean-Francois Moine [this message]
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=20120228120548.186ee4bc@tele \
--to=moinejf@free.fr \
--cc=linux-media@vger.kernel.org \
/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.