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

[Scott B. <sco...@ve...>]

On Fri, 8 Oct 2004, Takashi Okumura wrote:

> 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
> 

Hi,

I will apply kartikey's latest changes to the netnice267 branch.  His
kernel seems to be working as I am using it to do this work.  


Scott B