so far, I've run:

cd /var/tmp/mp_kernel
cvs co -P syssrc/sys
cd arch/i386
cvs update -dP -A -rsommerfeld_i386mp_1 .
patch < /var/tmp/mp_kernel/patch (the patch Christos posted, Jan 14)

In short, the only part of the patch that went through was include/atomic.h.

Anyway, moving on...

: swamprat:/var/tmp/mp_kernel/sys/arch/i386/conf; config SWAMPRAT.MP
../../../../arch/i386/conf/files.i386:203: redefinition of `joy'
../../../../arch/i386/conf/files.i386:207: attach at `pci' already done by `joy_pci'
../../../../arch/i386/conf/files.i386:287: redefinition of `joy_isa'
../../../../arch/i386/conf/files.i386:315: redefinition of `joy_isapnp'
*** Stop.

It would seem that the files* family has moved out of compatability of "sommerfeld_i386mp_1".  I'll fiddle with it a bit and post a patch here if someone's willing to update the tag/branch.

Rob++
----------------------------------------
Internet: windsor@warthog.com                             __o
Life: Rob@Carrollton.Texas.USA.Earth                    _`\<,_
                                                       (_)/ (_)
The weather is here, wish you were beautiful.