[Netnice-kernels] Integration of Kertikey's code and Scott's code

[Takashi O. <ta...@cs...>]

alright. thanks kartikey.

i've got the file, and applied to linux-2.6.7.

>% bzip2 -dc ~/netnice-linux.diff.bz2 | patch -p1 --dry-run
> (snip)
> patching file kernel/exit.c
> Hunk #1 FAILED at 805.
> 1 out of 1 hunk FAILED -- saving rejects to file kernel/exit.c.rej
> (snip)
> patching file net/Kconfig
> The next patch would delete the file scripts/mod/elfconfig.h,
> which does not exist!  Assume -R? [n]
> Apply anyway? [n] y
> can't find file to patch at input line 2619
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff -Nru linux/scripts/mod/elfconfig.h linux-patched/scripts/mod/elfconfig.h
> |--- linux/scripts/mod/elfconfig.h      2004-09-25 23:49:46.000000000 +1000
> |+++ linux-patched/scripts/mod/elfconfig.h      1970-01-01 10:00:00.000000000 +1000
> --------------------------
> File to patch: y
> y: No such file or directory
> Skip this patch? [y]
> Skipping patch.
> 1 out of 1 hunk ignored
> nitrogen{19} pwd
> /tmp/linux-2.6.7

so, it looks mostly okay. as Scott suggested, it would work after minor
changes.

i appreciate your help, and now we have the latest codes, kartikey's
core-module, and scott's NNFS API (netnice file system, which is a subset
of linux procfs + netnice API extension). and so, as you guys mentioned,
we need to decide how to integrate the things together...

Kartikey bhatt wrote:
>
> What do you think about the status?
> Would you send me the changes that you have made?

Scott Brumbaugh wrote:
> I am thinking that I should add this to your CVS on a new branch off
> of MAIN, maybe called kartikey and then merge the fs/nnfs directory
> from the netnice267 branch.

i don't get scott's point here, why we need to set up a new branch for
the integrated code, which may make the CVS a bit more complicated.
isn't it possible to merge his code into your latest local copy, and
commit it to the repository? that way everybody can simply update
things... it is totally okay with me as long as you give us reasonable
explanation. but, at this point, i'm a bit confused.

since you have a developer access to the repository, you can create the
new branch you mentioned, but, i would be happy if you convince us first.

thanks!

-- taka

p.s.

for further discussion of the issue, please reply to this email.
i have renamed the subject to match the topic. thx.


Scott Brumbaugh wrote:
> 
> Hi Kartikey,
> 
> Thanks for the new patch, I have applied it and am running it now.
> I did have to disable vif_fork and the changes in ip_output.c in
> order to run the kernel here, I also needed to manually update
> kernel/exit.c.
> 
> Regards
> 
> Scott B