From 435bb2262d12aec56907032d7e4b53741159004c Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Wed, 9 Sep 2026 06:57:35 +0000 Subject: [PATCH] Repin ggml-org/llama.cpp#25731 (TML Inkling) at 946fc11d1, rebased onto upstream master The nightly on b10865 (run 34287079907) stopped in resolve: the pinned commit no longer merged after upstream #27764 moved the chat parsers into common/parsers and #26675 reworked ggml_prec. The PR branch now carries a merge of upstream master with both conflicts resolved, so the mix merges again on b10865 and b10870 with only the usual additive add/add merges. --- scripts/unsloth/pr-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 6b7de50dd81f..06d29286360f 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -19,7 +19,7 @@ ], "prs": [ "https://github.com/ggml-org/llama.cpp/pull/24423/commits/168b21adfb36f740989284c9d73a5ccabf679e46", - "https://github.com/ggml-org/llama.cpp/pull/25731/commits/1066edc3a533b036f630750d9c2c74ca95ff397e", + "https://github.com/ggml-org/llama.cpp/pull/25731/commits/946fc11d1afb1e6cd316e853f1b23487754a74b9", "https://github.com/unslothai/llama.cpp/pull/70/commits/883f2c9ba78f3847148454adf025da29385fff3e", "https://github.com/unslothai/llama.cpp/pull/61/commits/46cbf0e95786fe8f5b7c0e86d57aaf8f8eceea7f", "https://github.com/unslothai/llama.cpp/pull/95/commits/3db8cb5b2e9bf291057b9f19960e8601a162da81",