Johannes Engel написав(ла): > Maksym Veremeyenko wrote: >> [EMAIL PROTECTED] drm-2.6]# patch -p1 < ../drm-next-vblank-rework-2.patch >> patching file drivers/gpu/drm/drm_drv.c >> patching file drivers/gpu/drm/drm_irq.c >> Hunk #2 succeeded at 221 with fuzz 2. >> Hunk #3 succeeded at 238 (offset -3 lines). >> Hunk #4 succeeded at 280 with fuzz 2. >> Hunk #5 succeeded at 322 (offset -3 lines). >> .... >> >> am i doing wrong? >> > No, why? That are no errors. :) >
That is full output: [EMAIL PROTECTED] drm-2.6]# patch -p1 < ../drm-next-vblank-rework-2.patch patching file drivers/gpu/drm/drm_drv.c patching file drivers/gpu/drm/drm_irq.c Hunk #2 succeeded at 221 with fuzz 2. Hunk #3 succeeded at 238 (offset -3 lines). Hunk #4 succeeded at 280 with fuzz 2. Hunk #5 succeeded at 322 (offset -3 lines). Hunk #6 succeeded at 511 with fuzz 2. Hunk #7 succeeded at 527 (offset -3 lines). Hunk #9 succeeded at 557 (offset -3 lines). Hunk #11 succeeded at 614 (offset -3 lines). patching file drivers/gpu/drm/i915/i915_dma.c Hunk #1 FAILED at 673. Hunk #2 FAILED at 808. 2 out of 2 hunks FAILED -- saving rejects to file drivers/gpu/drm/i915/i915_dma.c.rej patching file drivers/gpu/drm/i915/i915_drv.c Hunk #1 succeeded at 539 (offset 454 lines). patching file drivers/gpu/drm/i915/i915_drv.h Hunk #1 FAILED at 83. Hunk #2 succeeded at 95 (offset -15 lines). Hunk #3 succeeded at 245 with fuzz 1 (offset -7 lines). Hunk #4 FAILED at 277. 2 out of 4 hunks FAILED -- saving rejects to file drivers/gpu/drm/i915/i915_drv.h.rej patching file drivers/gpu/drm/i915/i915_irq.c Hunk #1 FAILED at 35. Hunk #2 succeeded at 37 with fuzz 1 (offset -23 lines). Hunk #4 succeeded at 127 (offset -23 lines). Hunk #6 succeeded at 242 (offset -23 lines). Hunk #8 FAILED at 313. Hunk #9 FAILED at 369. Hunk #10 FAILED at 460. Hunk #11 succeeded at 439 (offset -58 lines). Hunk #12 FAILED at 485. Hunk #13 FAILED at 575. Hunk #14 succeeded at 655 (offset 2 lines). Hunk #15 succeeded at 616 (offset -58 lines). Hunk #16 succeeded at 696 (offset 2 lines). Hunk #17 succeeded at 653 (offset -58 lines). Hunk #18 succeeded at 724 (offset 2 lines). Hunk #19 succeeded at 676 (offset -58 lines). Hunk #20 succeeded at 744 (offset 2 lines). Hunk #21 FAILED at 770. Hunk #22 FAILED at 804. 8 out of 22 hunks FAILED -- saving rejects to file drivers/gpu/drm/i915/i915_irq.c.rej patching file drivers/gpu/drm/mga/mga_drv.c patching file drivers/gpu/drm/mga/mga_drv.h patching file drivers/gpu/drm/mga/mga_irq.c patching file drivers/gpu/drm/r128/r128_drv.c patching file drivers/gpu/drm/r128/r128_drv.h patching file drivers/gpu/drm/r128/r128_irq.c patching file drivers/gpu/drm/radeon/radeon_drv.c patching file drivers/gpu/drm/radeon/radeon_drv.h Hunk #1 succeeded at 378 (offset -4 lines). patching file drivers/gpu/drm/radeon/radeon_irq.c patching file drivers/gpu/drm/via/via_drv.c patching file drivers/gpu/drm/via/via_drv.h patching file drivers/gpu/drm/via/via_irq.c patching file include/drm/drm.h Hunk #1 succeeded at 471 (offset 17 lines). Hunk #3 succeeded at 601 (offset 17 lines). patching file include/drm/drmP.h Hunk #3 succeeded at 773 (offset 1 line). patch unexpectedly ends in middle of line Hunk #5 succeeded at 1049 with fuzz 1 (offset 1 line). [EMAIL PROTECTED] drm-2.6]# it seems to me not all files patched correctly.. i will try to retry git repo clone. is it correct command to clone drm-next branch: git clone \ git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git -- ________________________________________ Maksym Veremeyenko ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
