make world

cd /usr/src/usr.sbin/config
make all install clean
cd /usr/src; make kernel
reboot
cd /usr/src; make world
mergemaster
reboot