From 8b5ef8255a43efcc9ec9a83c1570a573342e479f Mon Sep 17 00:00:00 2001 From: Daniel Han Date: Wed, 29 Jul 2026 10:22:46 +0000 Subject: [PATCH] Prebuilt: repin the PR set on Inkling and Kimi-K3 The nightly died in resolve: unslothai#40 carried MiniMax-M3 plus Inkling, upstream master now ships its own MiniMax-M3, and the two collided in src/models/models.h and tests/test-backend-ops.cpp. Every build job was skipped. Drop the two MiniMax entries (ggml-org#24523 is closed anyway, so it was already inert) and repin on the four PRs we actually want: ggml-org#24423 DiffusionGemma ggml-org#25731 TML Inkling unslothai#44 Kimi-K3 fixes + MoonViT-3d vision tower ggml-org#26185 Kimi-K3 text #25731 and #44 both had their conflicts against current master fixed on their own branches, and #44 also carries the Inkling merge: the two archs land in the same arch/model/mtmd registries, so they cannot go in as two independent heads and one of them has to know about the other. #26185 is last on purpose. Its head is an ancestor of #44, so by the time the resolver gets there the merge is a no-op; listed before #44 it conflicts on tests/test-llama-archs.cpp. It stays in the set so the release manifest names it. Verified locally against b10173: the four merge in this order with zero unmerged paths, and the merged tree builds with -DGGML_CUDA=OFF -DLLAMA_CURL=OFF -DLLAMA_BUILD_TESTS=ON. Assisted-by: Claude Code --- scripts/unsloth/pr-set.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 4fad15e9d747..ed61b6aa41b4 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -10,7 +10,8 @@ ], "prs": [ "https://github.com/ggml-org/llama.cpp/pull/24423/commits/c3fb97241295c196e09b783e705e84b96cd1bd74", - "https://github.com/ggml-org/llama.cpp/pull/24523/commits/baee0f5b24ec8ceac109ecf07988cb5440c03a6d", - "https://github.com/unslothai/llama.cpp/pull/40/commits/233cedbe9c37df1c9ca7b11634c580e45974b046" + "https://github.com/ggml-org/llama.cpp/pull/25731/commits/79ca732e11e9b875f29c6a6cb65150978e6ec014", + "https://github.com/unslothai/llama.cpp/pull/44/commits/23fac110127ba3ac56bd8b370eb0205a67564d55", + "https://github.com/ggml-org/llama.cpp/pull/26185/commits/cf67f0d24511864d2d3da0769108fd6fc16d00d1" ] } \ No newline at end of file