Atsushi Onoe <onoe@sm.sony.co.jp> writes:

> > 	we do have them for purely kame-origin files like sys/netinet6/*.c.
> > 	this time, it was netbsd-originated, and modified-by-kame, file
> > 	(like sys/netinet/in.h).
> 
> If the file is netbsd-originated, it is probably not shared among other BSDs,
> and KAME can easily merge the changes made by NetBSD, I guess.
> Am I missing?

Even if it was purely NetBSD origin, if the modification by NetBSD
localy and local KAME change (i.e., not yet commitied back to the
NetBSD cvs tree) are conflicts (i.e. both are done in a closer region
enough), it conflicts, doesn't it?

So, it probably fall into how often that conflicts region are
modified.


BTW, again BTW, a developer who first commits changes should pay more
and more an attention to the coding style (including white space
usage).  Your grandchildren may read you code.

enami