merge into the new kernel