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@xxxxxxxxx> 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, -- Sylwester Nawrocki Samsung Poland R&D Center -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
