From: | "Sepherosa Ziehau" <sepherosa@xxxxxxxxx> |
Date: | Mon, 18 Sep 2006 08:20:30 -0400 |
Best Regards, sephe
Sepherosa Ziehau wrote: > The problem may be caused by that second skc's skc_probe() > reinitializes a global "sk_serializer" > > Please try the attached patch. >
Thanks, but the patch fails to apply successfully against the 20060912 snapshot of 1.6-release, here is what I get:
-------------------------------------------------------------------- %patch < /root/sk.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- if_sk.c.orig 2006-09-18 09:20:58.514614912 -0400 |+++ if_sk.c 2006-09-18 09:28:54.199299848 -0400 -------------------------- Patching file if_sk.c using Plan A... Hunk #1 succeeded at 261. Hunk #2 succeeded at 1075 (offset -1 lines). Hunk #3 failed at 1164. Hunk #4 succeeded at 1312 (offset -1 lines). Hunk #5 succeeded at 1326 (offset -1 lines). Hunk #6 succeeded at 1424 (offset -1 lines). Hunk #7 failed at 1507. 2 out of 7 hunks failed--saving rejects to if_sk.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- if_skreg.h.orig 2006-09-18 09:21:52.348430928 -0400 |+++ if_skreg.h 2006-09-18 09:24:14.550812880 -0400 -------------------------- Patching file if_skreg.h using Plan A... Hunk #1 succeeded at 1434. Hunk #2 succeeded at 1463. done --------------------------------------------------------------------
Sorry to be a pain in the a**, I'd fix this if I could.
-- Live Free or Die
Attachment:
sk1.diff
Description: Binary data