Delete defconfig added in cherry pick