From 25fffafb4be95cfa886e3ac74647d7d12cfae071 Mon Sep 17 00:00:00 2001 From: Daniel Han Date: Sun, 26 Jul 2026 12:08:48 +0000 Subject: [PATCH] Prebuilt: finish the PR set repin #39 landed the first pin refresh only, so master still points at commits that have since moved on and that conflict with each other. ggml-org #24523 was force-pushed: it now places LLM_ARCH_MINIMAX_M3 next to LLM_ARCH_MINIMAX_M2 rather than at the tail of the enum, matching how llama-arch.cpp already groups the name table. That removes the src/llama-arch.h half of its collision with #25731, which appends LLM_ARCH_INKLING at the tail. New head baee0f5b2. ggml-org #25731 has picked up current master and the thinking_end_tags rename, so it now builds on its own against b10133 and newer. Its entry is replaced by unslothai #40, which carries what is still unresolvable between the two: both add a chat parser and a detection block in the same region of common/chat.cpp, immediately before "namespace workaround {". chat.cpp has no MiniMax-M2 parser to sit beside, so there is no principled alternative anchor for that half. Replaying the resolver sequence on b10133: OK ggml-org #24423 @ c3fb97241 OK ggml-org #24523 @ baee0f5b2 OK unslothai #40 @ 233cedbe9 Drop the #40 entry and repin #25731 upstream once either PR lands. --- scripts/unsloth/pr-set.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 868c029cbaf3..4fad15e9d747 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -10,7 +10,7 @@ ], "prs": [ "https://github.com/ggml-org/llama.cpp/pull/24423/commits/c3fb97241295c196e09b783e705e84b96cd1bd74", - "https://github.com/ggml-org/llama.cpp/pull/24523/commits/a58a7fa6e89f9564f78caaf1f858c810c070b216", - "https://github.com/ggml-org/llama.cpp/pull/25731/commits/453c43816eacc18a6d69dcc4d7fab2966c6951c8" + "https://github.com/ggml-org/llama.cpp/pull/24523/commits/baee0f5b24ec8ceac109ecf07988cb5440c03a6d", + "https://github.com/unslothai/llama.cpp/pull/40/commits/233cedbe9c37df1c9ca7b11634c580e45974b046" ] } \ No newline at end of file