Clean up kernel merge