On Tuesday 17 September 2002 21:52, raptor wrote: Hi Raptor,> When I apply HTB3 paches to 2.4.19 (mandrake kernel) I get this : > (NO to all questions) > --------------------------------------------------------------------------- >- [root@qos test]# patch -p1 -b </arh/compile/patches/htb3.6_2.4.17.diff > patching file net/sched/Config.in > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file net/sched/Config.in.rej > patching file net/sched/Makefile > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file net/sched/Makefile.rej > patching file net/sched/sch_htb.c > patching file include/linux/pkt_sched.h > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file > include/linux/pkt_sched.h.rej patching file net/sched/sch_api.c > Hunk #1 FAILED at 1117. > Hunk #2 succeeded at 1205 with fuzz 2. > 1 out of 2 hunks FAILED -- saving rejects to file net/sched/sch_api.c.rej > patching file lib/Makefile > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file lib/Makefile.rej > patching file lib/rbtree.c > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 3 out of 3 hunks ignored -- saving rejects to file lib/rbtree.c.rej > patching file include/net/pkt_sched.h > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file > include/net/pkt_sched.h.rej > ---------------------------------------------------------------------------hmm, maybe htb is already in the mdk kernel? anyway, you should patch with "patch -p1 --dry-run < patchname" FIRST, before applying and see if it succeed. -- Kind regards Marc-Christian Petersen http://sourceforge.net/projects/wolk PGP/GnuPG Key: 1024D/569DE2E3DB441A16 Fingerprint: 3469 0CF8 CA7E 0042 7824 080A 569D E2E3 DB44 1A16 Key available at www.keyserver.net. Encrypted e-mail preferred. _______________________________________________ LARTC mailing list / LARTC@mailman.ds9a.nl http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
On Tuesday 17 September 2002 21:52, raptor wrote:> When I apply HTB3 paches to 2.4.19 (mandrake kernel) I get this : > (NO to all questions)Some parts of the htb patch fixes other, small network problems. But these changes are already applied to the 2.4.19 kernel. So just press enter and it will work. At least on the 2.4.19 kernel from kernel.org. If you check out the *.rej files and the original files, you will see that the changes in the *.rej files are allready applied. Stef -- stef.coene@docum.org "Using Linux as bandwidth manager" http://www.docum.org/ #lartc @ irc.oftc.net _______________________________________________ LARTC mailing list / LARTC@mailman.ds9a.nl http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
When I apply HTB3 paches to 2.4.19 (mandrake kernel) I get this :
(NO to all questions)
----------------------------------------------------------------------------
[root@qos test]# patch -p1 -b </arh/compile/patches/htb3.6_2.4.17.diff
patching file net/sched/Config.in
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file net/sched/Config.in.rej
patching file net/sched/Makefile
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file net/sched/Makefile.rej
patching file net/sched/sch_htb.c
patching file include/linux/pkt_sched.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/pkt_sched.h.rej
patching file net/sched/sch_api.c
Hunk #1 FAILED at 1117.
Hunk #2 succeeded at 1205 with fuzz 2.
1 out of 2 hunks FAILED -- saving rejects to file net/sched/sch_api.c.rej
patching file lib/Makefile
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file lib/Makefile.rej
patching file lib/rbtree.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file lib/rbtree.c.rej
patching file include/net/pkt_sched.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/net/pkt_sched.h.rej
------------------------------------------------------------------------------------
LATER WHEN COMPILING
=================================================================================sch_htb.c:2153:
redefinition of `htb_activate_prios''
sch_htb.c:517: `htb_activate_prios'' previously defined here
sch_htb.c:2190: redefinition of `htb_deactivate_prios''
sch_htb.c:554: `htb_deactivate_prios'' previously defined here
sch_htb.c:2233: redefinition of `htb_class_mode''
sch_htb.c:597: `htb_class_mode'' previously defined here
sch_htb.c:2266: redefinition of `htb_change_class_mode''
sch_htb.c:630: `htb_change_class_mode'' previously defined here
sch_htb.c:2293: redefinition of `htb_activate''
sch_htb.c:657: `htb_activate'' previously defined here
sch_htb.c:2311: redefinition of `htb_deactivate''
sch_htb.c:675: `htb_deactivate'' previously defined here
sch_htb.c:2320: redefinition of `htb_enqueue''
sch_htb.c:684: `htb_enqueue'' previously defined here
...many similar..................
{standard input}: Assembler messages:
{standard input}:5078: Error: symbol `L2T'' is already defined
{standard input}:5099: Error: symbol `htb_hash'' is already defined
{standard input}:5114: Error: symbol `htb_find'' is already defined
{standard input}:5155: Error: symbol `htb_clasify'' is already defined
{standard input}:5272: Error: symbol `htb_debug_dump'' is already
defined
{standard input}:5523: Error: symbol `htb_add_to_id_tree'' is already
defined
{standard input}:5642: Error: symbol `htb_add_to_wait_tree'' is already
defined
{standard input}:5772: Error: symbol `htb_next_rb_node'' is already
defined
{standard input}:5814: Error: symbol `htb_add_class_to_row'' is already
defined
{standard input}:5878: Error: symbol `htb_remove_class_from_row'' is
already defined
{standard input}:6015: Error: symbol `htb_activate_prios'' is already
defined
{standard input}:6139: Error: symbol `htb_deactivate_prios'' is already
defined
sch_htb.c:2770: redefinition of `htb_init''
sch_htb.c:1134: `htb_init'' previously defined here
...............many similar..............................
{standard input}:6331: Error: symbol `htb_class_mode'' is already
defined
{standard input}:6391: Error: symbol `htb_change_class_mode'' is already
defined
{standard input}:6459: Error: symbol `htb_activate'' is already defined
{standard input}:6518: Error: symbol `htb_deactivate'' is already
defined
..............similar..................
{standard input}:9850: Error: symbol `cleanup_module'' is already
defined
make[2]: *** [sch_htb.o] Error 1
make[2]: Leaving directory `/usr/src/linux-2.4.19-9mdk/net/sched''
make[1]: *** [_modsubdir_sched] Error 2
make[1]: Leaving directory `/usr/src/linux-2.4.19-9mdk/net''
make: *** [_mod_net] Error 2
[root@qos linux-2.4.19-9mdk]#
_______________________________________________
LARTC mailing list / LARTC@mailman.ds9a.nl
http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
|hmm, maybe htb is already in the mdk kernel? | |anyway, you should patch with "patch -p1 --dry-run < patchname" FIRST, before |applying and see if it succeed. ]- yep it is in, but i''m not sure is it the latest ?? is there a way I can check this ... "Dry run", hu :") didn''t knew it _______________________________________________ LARTC mailing list / LARTC@mailman.ds9a.nl http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/
Now i applied it again this time answering yes, the only .rej file I got is this : is it fatal !? ------------------------------------ [root@qos sched]# cat *rej *************** *** 1117,1123 **** psched_timer.expires = jiffies + 1*HZ; #else unsigned long now = jiffies; - psched_time_base = ((u64)now)<<PSCHED_JSCALE; psched_time_mark = now; psched_timer.expires = now + 60*60*HZ; #endif --- 1117,1124 ---- psched_timer.expires = jiffies + 1*HZ; #else unsigned long now = jiffies; + //psched_time_base = ((u64)now)<<PSCHED_JSCALE; + psched_time_base += ((u64)(now-psched_time_mark))<<PSCHED_JSCALE; psched_time_mark = now; psched_timer.expires = now + 60*60*HZ; #endif [root@qos sched]# _______________________________________________ LARTC mailing list / LARTC@mailman.ds9a.nl http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/