Em Wed, 17 Jun 2009 08:46:19 +0200 Hans de Goede <hdegoede@xxxxxxxxxx> escreveu: > Hi Mauro, > > Can you please pull from: > http://linuxtv.org/hg/~hgoede/gspca > > I've asked JF Moine a couple of days ago if he wanted > this to go through his tree or directly, but have not > received an answer, as there is one important bugfix > in this tree I'm now asking you to pull this directly. Hmm... your tree seems to be based on JF Moine one. There are several patches that were already merged appearing again to me, as shown at the enclosed logs. Also, checkpatch is warning about a few troubles at the patches. Could you please create another tree, directly based on mine, fix the coding styles and send another pull request? > p.s. > > Given that I'm currently doing quite a bit of gspca work > I think its best for the future if I just send pull requests > to you directly is that ok ? For me that's ok. Just avoid touching at gspca core without sync with Jean-Francois, to avoid merge conflicts. Cheers, Mauro. $ ./hgimport http://linuxtv.org/hg/~hgoede/gspca Pushing from remote site http://linuxtv.org/hg/~hgoede/gspca, tree: gspca Number of patches: 30 /tmp/newpatches/hg_gspca_01.patch with cs=b39bf9d2d088 First patch. Patch against an older patch: changeset: 11721:59f970bfcf5f parent: 11707:a6e9c1a8a3c9 parent: 11720:712c57ab2315 user: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> date: Sat May 09 06:34:19 2009 -0300 summary: merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb /tmp/newpatches/hg_gspca_02.patch with cs=c52097c4b796 Ok. /tmp/newpatches/hg_gspca_03.patch with cs=352c3fbcbaa7 Nok/Merge: Old node ID: c52097c4b79677ed68dd3cdcc7061c12bbf23628 Node parents c52097c4b79677ed68dd3cdcc7061c12bbf23628 8d37e850566419e7905e66f875b9384d96bf340d Renamed to /tmp/newpatches/hg_gspca_03.merge /tmp/newpatches/hg_gspca_03.patch with cs=74a6228c7d3a Ok. /tmp/newpatches/hg_gspca_04.patch with cs=f453f6641d09 Nok/Merge: Old node ID: 74a6228c7d3a78240a4c8230be79f9d934aedc21 Node parents 74a6228c7d3a78240a4c8230be79f9d934aedc21 315bc4b65b4f527c4f9bc4fe3290e10f07975437 Renamed to /tmp/newpatches/hg_gspca_04.merge /tmp/newpatches/hg_gspca_04.patch with cs=fb857617b17b Ok. /tmp/newpatches/hg_gspca_05.patch with cs=b350bf3c9910 Ok. /tmp/newpatches/hg_gspca_06.patch with cs=891510e73ea7 Ok. /tmp/newpatches/hg_gspca_07.patch with cs=9cb97be16341 Ok. /tmp/newpatches/hg_gspca_08.patch with cs=c4bd8403b042 Nok/Merge: Old node ID: 9cb97be1634149d7a2b91b6bc204e58dc9ee7bcd Node parents 9cb97be1634149d7a2b91b6bc204e58dc9ee7bcd 5ed2a853b69218bf6f6dfdb7f4816ba4e5d78fa4 Renamed to /tmp/newpatches/hg_gspca_08.merge /tmp/newpatches/hg_gspca_08.patch with cs=e42a9739690d Ok. /tmp/newpatches/hg_gspca_09.patch with cs=fff1a04edcd7 Ok. /tmp/newpatches/hg_gspca_10.patch with cs=54b0a6ba6521 Ok. /tmp/newpatches/hg_gspca_11.patch with cs=6a78a10d97e2 Ok. /tmp/newpatches/hg_gspca_12.patch with cs=3e51f723a019 Ok. /tmp/newpatches/hg_gspca_13.patch with cs=d5af2604e915 Nok/Merge: Old node ID: 3e51f723a01942460a3abf8b407d6a818379289f Node parents 3e51f723a01942460a3abf8b407d6a818379289f bff77ec331161c660be7a60bf6139df000758480 Renamed to /tmp/newpatches/hg_gspca_13.merge /tmp/newpatches/hg_gspca_13.patch with cs=0649c95d8cba Ok. /tmp/newpatches/hg_gspca_14.patch with cs=a1e8596544b8 Ok. /tmp/newpatches/hg_gspca_15.patch with cs=ff01a38c70a1 Ok. /tmp/newpatches/hg_gspca_16.patch with cs=91b64d7bc5eb Ok. /tmp/newpatches/hg_gspca_17.patch with cs=3a253f13111b Ok. /tmp/newpatches/hg_gspca_18.patch with cs=dd8139a56412 Ok. /tmp/newpatches/hg_gspca_19.patch with cs=35a3ef2e9da2 Ok. /tmp/newpatches/hg_gspca_20.patch with cs=2881cb04db55 Ok. /tmp/newpatches/hg_gspca_21.patch with cs=bd750ac05a62 Ok. /tmp/newpatches/hg_gspca_22.patch with cs=a6038b3c1749 Ok. /tmp/newpatches/hg_gspca_23.patch with cs=d5a08ff3b0ca Ok. /tmp/newpatches/hg_gspca_24.patch with cs=a3099efabcc0 Ok. /tmp/newpatches/hg_gspca_25.patch with cs=f8a56805e569 Ok. /tmp/newpatches/hg_gspca_26.patch with cs=59da93464e62 Ok. Diffstat of the imported series: linux/Documentation/video4linux/gspca.txt | 5 linux/drivers/media/video/Kconfig | 6 linux/drivers/media/video/gspca/gspca.c | 165 linux/drivers/media/video/gspca/ov519.c | 1534 ++++++- linux/drivers/media/video/gspca/ov534.c | 268 - linux/drivers/media/video/gspca/spca505.c | 14 linux/drivers/media/video/gspca/spca508.c | 2048 ++++------ linux/drivers/media/video/gspca/spca561.c | 107 linux/drivers/media/video/gspca/stv06xx/Makefile | 3 linux/drivers/media/video/gspca/stv06xx/stv06xx.c | 53 linux/drivers/media/video/gspca/stv06xx/stv06xx.h | 11 linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 10 linux/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 3 linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 453 ++ linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h | 59 linux/drivers/media/video/ov511.c | 2 linux/include/linux/videodev2.h | 7 17 files changed, 3284 insertions(+), 1464 deletions(-) /tmp/newpatches/hg_gspca_19.patch: gspca_ov519: Fix 320x240 with ov7660 sensor WARNING: suspect code indent for conditional statements (8, 10) #31: FILE: linux/drivers/media/video/gspca/ov519.c:1980: + if (sd->sensor == SEN_OV7670 && [...] + reg_w(sd, OV519_R12_X_OFFSETL, 0x04); total: 0 errors, 1 warnings, 20 lines checked /tmp/newpatches/hg_gspca_21.patch: gspca_ov519: add support for the ov511 bridge WARNING: suspect code indent for conditional statements (8, 17) #501: FILE: linux/drivers/media/video/gspca/ov519.c:2159: + if (!alt) { + PDEBUG(D_ERR, "Couldn't get altsetting"); WARNING: line over 80 characters #706: FILE: linux/include/linux/videodev2.h:351: +#define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 compression */ total: 0 errors, 2 warnings, 672 lines checked /tmp/newpatches/hg_gspca_22.patch: gspca_ov519: Fix ov518+ with OV7620AE (Trust spacecam 320) WARNING: suspect code indent for conditional statements (8, 17) #154: FILE: linux/drivers/media/video/gspca/ov519.c:2283: + if (!alt) { + PDEBUG(D_ERR, "Couldn't get altsetting"); total: 0 errors, 1 warnings, 207 lines checked /tmp/newpatches/hg_gspca_24.patch: gspca_stv06xx: Add support for st6422 bridge and sensor WARNING: suspect code indent for conditional statements (0, 0) #437: FILE: linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c:192: +//if(urb->iso_frame_desc[i].status == 0x80) { +//if(urb->iso_frame_desc[i].status == 0x88) { ERROR: do not use C99 // comments #437: FILE: linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c:192: +//if(urb->iso_frame_desc[i].status == 0x80) { ERROR: do not use C99 // comments #438: FILE: linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c:193: +//if(urb->iso_frame_desc[i].status == 0x88) { WARNING: suspect code indent for conditional statements (8, 17) #494: FILE: linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c:249: + if (!alt) { + PDEBUG(D_ERR, "Couldn't get altsetting"); total: 2 errors, 2 warnings, 709 lines checked To cherry pick all files, you can do something like: for i in /tmp/newpatches/*.patch; do ./mailimport $i; done To merge it, the better is to run the merge script: ./v4l/scripts/do_merge.pl http://linuxtv.org/hg/~hgoede/gspca - Those are the patches that were retrieved: $ for i in /tmp/newpatches/*.patch; do cat $i|grep -v ^#|head -2; done|grep -vr "^$" gspca - spca508: Cleanup source and update copyright. gspca - spca508: Optimize code. gspca - ov534: JPEG 320x240 and 640x480 formats for ov965x. gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added. gspca - spca561: Change the Rev12a controls. gspca - spca561: Rename the 'White Balance' control to 'Hue'. gspca - spca505: Reinitialize the webcam at resume time. gspca - ov519: Add support for the ov518 bridge. gspca - doc: Add the 05a9:a518 webcam to the Documentation. gspca - main: Skip disabled controls. gspca - ov534: Do the ov772x work again. gspca - spca508: Extend the write_vector routine. gspca: fix NULL pointer deref in query_ctrl gspca-ov519: add extra controls gspca_ov519: limit ov6630 qvif uv swap fix to ov66308AF gspca_ov519: Add 320x240 and 160x120 support for cif sensor cams gspca_ov519: check ov518 packet numbers gspca_ov519: Fix led inversion with some cams gspca_ov519: Fix 320x240 with ov7660 sensor gspca_ov519: Better default contrast for ov6630 gspca_ov519: add support for the ov511 bridge gspca_ov519: Fix ov518+ with OV7620AE (Trust spacecam 320) gspca_ov519: Cleanup some sensor special cases gspca_stv06xx: Add support for st6422 bridge and sensor ov511: remove ov518 usb id's from the driver ov511: mark as deprecated -- You should note that several patches were already applied: $ for i in /tmp/newpatches/*.patch; do patch -p1 -i $i -t;done patching file linux/drivers/media/video/gspca/spca508.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #15 succeeded at 1534 (offset -14 lines). Hunk #17 succeeded at 1567 (offset -14 lines). Hunk #19 succeeded at 1594 (offset -14 lines). patching file linux/drivers/media/video/gspca/spca508.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #1 succeeded at 1474 (offset 123 lines). Hunk #3 succeeded at 1518 (offset 123 lines). patching file linux/drivers/media/video/gspca/ov534.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #17 succeeded at 903 (offset 2 lines). patching file linux/drivers/media/video/gspca/gspca.c Reversed (or previously applied) patch detected! Assuming -R. patching file linux/drivers/media/video/gspca/spca561.c Reversed (or previously applied) patch detected! Assuming -R. patching file linux/drivers/media/video/gspca/spca561.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #3 succeeded at 959 (offset -1 lines). Hunk #4 succeeded at 1015 (offset 13 lines). patching file linux/drivers/media/video/gspca/spca505.c Reversed (or previously applied) patch detected! Assuming -R. patching file linux/drivers/media/video/gspca/ov519.c Reversed (or previously applied) patch detected! Assuming -R. patching file linux/include/linux/videodev2.h Reversed (or previously applied) patch detected! Assuming -R. patching file linux/Documentation/video4linux/gspca.txt Reversed (or previously applied) patch detected! Assuming -R. patching file linux/drivers/media/video/gspca/gspca.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #1 succeeded at 995 (offset -26 lines). patching file linux/drivers/media/video/gspca/ov534.c Reversed (or previously applied) patch detected! Assuming -R. Hunk #1 succeeded at 858 (offset -100 lines). patching file linux/drivers/media/video/gspca/spca508.c Hunk #1 FAILED at 1350. 1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/video/gspca/spca508.c.rej patching file linux/drivers/media/video/gspca/gspca.c Hunk #1 FAILED at 1054. 1 out of 1 hunk FAILED -- saving rejects to file linux/drivers/media/video/gspca/gspca.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 58 (offset -7 lines). Hunk #2 FAILED at 89. Hunk #3 succeeded at 146 (offset -3 lines). Hunk #4 succeeded at 172 (offset -7 lines). Hunk #5 succeeded at 423 (offset -46 lines). Hunk #6 succeeded at 1471 (offset -241 lines). Hunk #7 succeeded at 2172 (offset -151 lines). Hunk #8 FAILED at 2206. Hunk #9 succeeded at 2188 (offset -298 lines). Hunk #10 succeeded at 2421 (offset -152 lines). Hunk #11 succeeded at 2427 (offset -298 lines). Hunk #12 succeeded at 2650 (offset -152 lines). 2 out of 12 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/include/linux/videodev2.h Hunk #1 succeeded at 893 (offset -1 lines). patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 70 (offset -7 lines). Hunk #2 succeeded at 1313 (offset -103 lines). Hunk #3 succeeded at 1557 (offset -190 lines). Hunk #4 succeeded at 1906 (offset -203 lines). Hunk #5 succeeded at 1940 (offset -190 lines). Hunk #6 FAILED at 2028. Hunk #7 succeeded at 2041 (offset -208 lines). Hunk #8 succeeded at 2236 (offset -250 lines). Hunk #9 succeeded at 2307 with fuzz 2 (offset -208 lines). Hunk #10 succeeded at 2309 (offset -251 lines). Hunk #11 succeeded at 2416 (offset -208 lines). Hunk #12 succeeded at 2382 (offset -251 lines). 1 out of 12 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 FAILED at 241. Hunk #2 FAILED at 276. Hunk #3 succeeded at 1666 (offset -393 lines). Hunk #5 FAILED at 2247. 3 out of 5 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 49 with fuzz 2. Hunk #2 FAILED at 2418. 1 out of 2 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 FAILED at 58. Hunk #2 FAILED at 1472. Hunk #3 FAILED at 1657. Hunk #4 FAILED at 2873. 4 out of 4 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 1556 (offset -421 lines). Hunk #2 succeeded at 2333 (offset -10 lines). patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 1419 with fuzz 1 (offset -321 lines). patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 65 (offset -11 lines). Hunk #2 FAILED at 293. Hunk #3 FAILED at 1128. Hunk #4 succeeded at 1203 (offset -96 lines). Hunk #5 succeeded at 1309 (offset -11 lines). Hunk #6 FAILED at 1686. Hunk #7 FAILED at 1725. Hunk #8 FAILED at 1756. Hunk #9 FAILED at 1923. Hunk #10 FAILED at 1969. Hunk #11 FAILED at 2031. Hunk #12 succeeded at 1830 (offset -310 lines). Hunk #13 FAILED at 2531. Hunk #14 succeeded at 2746 with fuzz 1 (offset -137 lines). Hunk #15 FAILED at 2890. Hunk #16 FAILED at 3258. 11 out of 16 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/include/linux/videodev2.h Hunk #1 FAILED at 348. 1 out of 1 hunk FAILED -- saving rejects to file linux/include/linux/videodev2.h.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 FAILED at 269. Hunk #2 FAILED at 325. Hunk #3 succeeded at 561 (offset -143 lines). Hunk #4 succeeded at 1456 (offset -79 lines). Hunk #5 FAILED at 1492. Hunk #6 FAILED at 1544. Hunk #7 succeeded at 1657 (offset -547 lines). Hunk #8 FAILED at 1727. Hunk #9 FAILED at 1776. Hunk #10 succeeded at 2402 (offset -179 lines). 6 out of 10 hunks FAILED -- saving rejects to file linux/drivers/media/video/gspca/ov519.c.rej patching file linux/drivers/media/video/gspca/ov519.c Hunk #1 succeeded at 380 (offset -149 lines). Hunk #2 succeeded at 1644 (offset -480 lines). Hunk #3 succeeded at 2348 (offset -271 lines). Hunk #4 succeeded at 2153 (offset -480 lines). patching file linux/drivers/media/video/gspca/stv06xx/Makefile patching file linux/drivers/media/video/gspca/stv06xx/stv06xx.c Hunk #3 succeeded at 317 (offset -2 lines). Hunk #5 succeeded at 381 (offset -2 lines). Hunk #7 succeeded at 451 (offset -2 lines). patching file linux/drivers/media/video/gspca/stv06xx/stv06xx.h patching file linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c patching file linux/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h patching file linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c patching file linux/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h patching file linux/drivers/media/video/ov511.c Hunk #1 succeeded at 211 (offset 2 lines). patching file linux/drivers/media/video/Kconfig Hunk #1 succeeded at 866 (offset 4 lines). Cheers, Mauro -- 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
