Some merging of defconfigs