merge out kernel-kit too