Merge commit 'df270ef74596da8f1178f08991f4c51f18c9ee82' into concedo_experimental

# Conflicts:
#	Makefile
#	common/CMakeLists.txt
#	common/common.h
#	common/sampling.cpp
#	common/sampling.h
#	examples/infill/infill.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/quantize-stats/quantize-stats.cpp
#	examples/server/server.cpp
#	include/llama.h
#	src/llama-sampling.cpp
#	src/llama-sampling.h
#	src/llama.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-grammar-parser.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-llama-grammar.cpp
#	tests/test-sampling.cpp

examples/gguf-split/README.md

@@ -1,10 +0,0 @@
-## GGUF split Example
-
-CLI to split / merge GGUF files.
-
-**Command line options:**
-
-- `--split`: split GGUF to multiple GGUF, default operation.
-- `--split-max-size`: max size per split in `M` or `G`, f.ex. `500M` or `2G`.
-- `--split-max-tensors`: maximum tensors in each split: default(128)
-- `--merge`: merge multiple GGUF to a single GGUF.