At last, I've updated not (my notebook) from 1.1 alpha to post 1.1
current (951222).  It it seems reliable, I'll update zen (still on
950818) too.

Two questions.  I got the expected panic when I rebooted after
building/installing everything due to init's inode being frobbed etc.

So I brought it up single user and then just did "sync" and then
"reboot".  I got another panic for my trouble.  Savecore says:

Dec 24 16:28:59 not savecore: reboot after panic: update: rofs mod
Dec 24 16:29:00 not savecore: writing core to /var/crash/netbsd.1.core
Dec 24 16:29:25 not savecore: writing kernel to /var/crash/netbsd.1

Is this significant? / was still read-only of course.
Then I let it come up multi-user - to save that
core file and then rebooted again.  It hung after saying
"rebooting..."

Apart from that, everything including pcmcia is working nicely.

The 2nd question is CVS related.  When I imported the 1.1 and then
current sources into my CVS tree, I had to do a merge to fix some
conflicts in some modules that I've been hacking on.

In the case of say kern/vfs_syscalls.c I've changed about 6 lines - to
remove the 4.4 symlink behaviour.  Yet the merge done by CVS resulted
in all the old function declarations being kept from the older
versions. 

The net result was that for just about all the kernel modules I've
hacked over the years, I had to do say:

rm vfs_syscalls.c
cvs update -r1.1.1.3 vfs_syscalls.c

then re-introduce my changes, to get a file that has only my changes
different from 1.1.

Apart from annoying, this is all cool.  The question is, how do I now
commit the result back to the HEAD branch?  When I attempt a simple
commit I get:

cvs commit: Examining .
cvs commit: sticky tag `1.1.1.3' for file `vfs_syscalls.c' is not a branch
cvs [commit aborted]: correct above errors first!

I could have simply checked out the 1.3 head version and then 
co -p1.1.1.3 on top of that and check that in, but that makes it look
like I've changed 100's of lines rather than just a few...

Can anyone tell me the "correct" course of action?

--sjg