Merged with kernel source