Re: 2.6.20-rt8 patch tweaked for 2.6.20.5




* John <linux.kernel@xxxxxxx> wrote:

Hello,

I've tweaked patch-2.6.20-rt8 so that it applies to 2.6.20.5

The unified diff is attached to this message.

thanks - this is useful to those who are not that much on the bleeding
edge.

I'd be happy to hear comments on what I've done wrong.

78 hunks had to be offset and 3 hunks had to be fuzzed.

$ grep -B1 fuzz patch.log
patching file arch/ia64/kernel/iosapic.c
Hunk #3 succeeded at 469 with fuzz 2.
--
patching file kernel/fork.c
Hunk #9 succeeded at 975 with fuzz 1.
--
patching file kernel/sched.c
Hunk #46 succeeded at 3996 with fuzz 1.

What is the fuzz value, exactly?

it's harmless: when the 'patch' utility didnt find the 'context' of the
patch chunk at its claimed position (because all patch chunks have
precise coordinates of source code embedded), but finds them 'nearby'
(or at least, somewhere in the file), it emits this reminder that the
underlying code did change since the patch was generated. Generating a
'clean' patch will get rid of these messages.

Ingo
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



Relevant Pages

  • Upgrade succeded from 3.8 to 3.9
    ... and restored data again. ... The next patch looks like a unified diff to me... ... Patching file etc/lynx.cfg using Plan A... ... Hunk #1 succeeded at 5. ...
    (comp.unix.bsd.openbsd.misc)
  • Re: Upgrade succeded from 3.8 to 3.9
    ... The next patch looks like a unified diff to me... ... Patching file etc/lynx.cfg using Plan A... ... Hunk #1 succeeded at 5. ...
    (comp.unix.bsd.openbsd.misc)
  • Re: 2.6.20-rt8 patch tweaked for 2.6.20.5
    ... The unified diff is attached to this message. ... Hunk #3 succeeded at 469 with fuzz 2. ... patch chunk at its claimed position, but finds them 'nearby', it emits this reminder that the underlying code did change since the patch was generated. ...
    (Linux-Kernel)
  • Re: [PATCH][RESEND]drivers/scsi/megaraid/megaraid_{mm,mbox}
    ... > The patch has been recreated against 2.6.11.8. ... > Please review the patch to previous driver. ... patching file Documentation/scsi/ChangeLog.megaraid ... Hunk #2 FAILED at 43. ...
    (Linux-Kernel)
  • Re: [PATCH] Ref counting for tty_struct and some locking clean up
    ... Diffed against the current git tree. ... making it have fuzz but none of them have broken it. ... Hunk #1 succeeded at 126 with fuzz 2. ... patching file drivers/char/vc_screen.c ...
    (Linux-Kernel)