merge linux-cfg