On Sun, Jun 7, 2009 at 8:05 PM, Gilles Espinasse<[email protected]> wrote: > ----- Original Message ----- > From: "Denys Vlasenko" <[email protected]> > To: "Gilles Espinasse" <[email protected]> > Cc: <[email protected]> > Sent: Sunday, June 07, 2009 4:27 PM > Subject: Re: [PATCH] Fix modprobe status reported v2 > > >>> function old new delta >>> modprobe_main 463 533 +70 >>> do_modprobe 266 277 +11 >>> add_probe 81 80 -1 >>> ------------------------------------------------------------------------- > ----- >>> (add/remove: 0/0 grow/shrink: 2/1 up/down: 81/-1) Total: 80 bytes >>> text data bss dec hex filename >>> 221388 1585 8752 231725 3892d busybox_old >>> 221468 1585 8752 231805 3897d busybox_unstripped >>> >> Sorry, there were changes to modprobe recently, and now patch doe s not > apply. >> Can you rediff it please? >> > Patch was against 1_14_stable branch. > Do you want patch against master or 1.14_stable or both?
Master: definitely. Hotfix for 1.14.1: optional. If you want to make hotfix for 1.14, you need to take pristine 1.14.1, apply http://busybox.net/downloads/fixes-1.14.1/busybox-1.14.1-modprobe.patch fix it further, and then rediff against pristine 1.14.1. In hotfixes, it's better to only fix bugs, not add features. -- vda _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
