On Friday, September 12, 2003, at 04:21  AM, Jun-ichiro itojun Hagino 
wrote:

>
> Module Name:	src
> Committed By:	itojun
> Date:		Fri Sep 12 11:21:00 UTC 2003
>
> Modified Files:
> 	src/sys/conf: files
> 	src/sys/netipsec: ipsec.c ipsec_input.c ipsec_netbsd.c ipsec_output.c
> 	    xform_ah.c xform_esp.c xform_ipcomp.c xform_ipip.c
> Added Files:
> 	src/sys/netipsec: files.netipsec
> Removed Files:
> 	src/sys/netipsec: files.ipsec key.c key.h key_debug.c key_debug.h
> 	    key_var.h
>
> Log Message:
> merge netipsec/key* into netkey/key*.  no need for both.
> change confusing filename

Woah, huge mistake.  The whole point is to have a separate copy so that 
it can evolve independently.  In fact, Sam has a bunch of changes to 
the PF_KEY code already, and now you've made it a lot more difficult to 
pick up those changes.

         -- Jason R. Thorpe <thorpej@wasabisystems.com>