CVS commit: [pgoyette-compat] src/sys

["Paul Goyette" <pgoyette%netbsd.org@localhost>]

Module Name:    src
Committed By:   pgoyette
Date:           Mon Jun 25 07:22:54 UTC 2018

Modified Files:
        src/sys/kern [pgoyette-compat]: kern_module.c
        src/sys/sys [pgoyette-compat]: module.h

Log Message:
Resolve conflicts with HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.8 -r1.130.2.9 src/sys/kern/kern_module.c
cvs rdiff -u -r1.41.14.8 -r1.41.14.9 src/sys/sys/module.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.