From b884607145070835561374cd5e40430974a7fb4b Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Wed, 16 Sep 2026 01:26:08 +0000 Subject: [PATCH 1/3] Repin DiffusionGemma to the commit that merges cleanly 168b21ad stopped merging onto the base tag: upstream added LLM_ARCH_MAPLE to the same unsupported-saver list and the same SWA-pattern test branch that DiffusionGemma extends, so both sides edited one line and additive_merge.py correctly refused it rather than papering over it. 12e0a962 is ggml-org#24423 merged with current master, both conflicts resolved by keeping both arches. Replayed the resolve loop on b10988: the pin now merges clean. --- 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 ea60e32607ac..6e01f337b204 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -18,7 +18,7 @@ "tag + pins), so keep its pin listed until the change lands upstream." ], "prs": [ - "https://github.com/ggml-org/llama.cpp/pull/24423/commits/168b21adfb36f740989284c9d73a5ccabf679e46", + "https://github.com/ggml-org/llama.cpp/pull/24423/commits/12e0a9627d02c6395fd4bbf2aadff93d0d46a0e4", "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", From d682360d10ef584c160c07ff2b18124b7baada14 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Wed, 16 Sep 2026 09:43:23 +0000 Subject: [PATCH 2/3] Repin GLM-5-Next to the commit that merges cleanly d94f44e7 stopped merging onto the base tag: upstream hoisted the src/CMakeLists.txt source list into set(LLAMA_CORE_SOURCES ...), so the pin was still adding llama-kv-cache-kpool.cpp to an inline list that no longer exists, and MAPLE landed in the same swiglu_clamp condition GLM5NEXT extends. e2738e07 is ggml-org#27754 merged with current master. kpool now goes into LLAMA_CORE_SOURCES, which is also what drives SKIP_UNITY_BUILD_INCLUSION, so it keeps its own translation unit. --- 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 6e01f337b204..09403f1252ba 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -23,7 +23,7 @@ "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", - "https://github.com/ggml-org/llama.cpp/pull/27754/commits/d94f44e79aa219d8057e8de21f95360a187ebf41", + "https://github.com/ggml-org/llama.cpp/pull/27754/commits/e2738e070b0f102a461cdd7d5a1706e9be06d848", "https://github.com/unslothai/llama.cpp/pull/137/commits/4e1865e34ec5f6ca39403215c89129c13731be70", "https://github.com/unslothai/llama.cpp/pull/158/commits/abfc45b9cb21eae4848cb82196e659f42c9a8341", "https://github.com/unslothai/llama.cpp/pull/157/commits/6c6da89266ba7839d825c9997782af4f4d26b81b", From 1aa6d6c01305a0588fb92f82b4734ae5e2f5e243 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Wed, 16 Sep 2026 09:45:47 +0000 Subject: [PATCH 3/3] Repin Qwen4exp MTP to the commit that merges cleanly a9e9c3c5 was cut against base/upstream-de8656bd9 and never merged onto a newer tag: upstream reshaped the hyper-connection norms to [n_embd, hc] with TENSOR_ALLOW_RESHAPE while the pin was still changing the same lines' flags argument for its MTP head. f40f64a8 keeps both, upstream's shapes with the pin's flags OR-ed in. PR 144 is retargeted to base/upstream-9f31776c3 so its own diff is unchanged at 24 files. --- 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 09403f1252ba..2502348f0e16 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -28,7 +28,7 @@ "https://github.com/unslothai/llama.cpp/pull/158/commits/abfc45b9cb21eae4848cb82196e659f42c9a8341", "https://github.com/unslothai/llama.cpp/pull/157/commits/6c6da89266ba7839d825c9997782af4f4d26b81b", "https://github.com/unslothai/llama.cpp/pull/149/commits/b65a2dce12c14a489e19a059cb6ee59112f1b733", - "https://github.com/unslothai/llama.cpp/pull/144/commits/a9e9c3c5fed8a0bb5cc617532d0d16b8f59c13e0", + "https://github.com/unslothai/llama.cpp/pull/144/commits/f40f64a81cf4d9f8c4539920828ad9d20f4ba7c5", "https://github.com/unslothai/llama.cpp/pull/152/commits/b2b5ed9ff86427a530b762a45d3fdbd453bcd4e8", "https://github.com/unslothai/llama.cpp/pull/176/commits/09ce1a4d2939844e211f7b4d30a296f4c1aed9a8" ]