Prebuilt: finish the PR set repin (#41)

danielhanchen · shimmyshimmer · web-flow · commit 0036e62640aa · 2026-07-26T05:25:26.000-07:00
#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 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 ggml-org#25731, which appends LLM_ARCH_INKLING at the tail. New head baee0f5. ggml-org 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 ggml-org#24423 @ c3fb972 OK ggml-org ggml-org#24523 @ baee0f5 OK unslothai #40 @ 233cedb Drop the #40 entry and repin ggml-org#25731 upstream once either PR lands. Co-authored-by: Daniel Han <unslothai@gmail.com>
diff --git 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"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`],`
`11`	`11`	`"prs": [`
`12`	`12`	`"https://github.com/ggml-org/llama.cpp/pull/24423/commits/c3fb97241295c196e09b783e705e84b96cd1bd74",`
`13`		`- "https://github.com/ggml-org/llama.cpp/pull/24523/commits/a58a7fa6e89f9564f78caaf1f858c810c070b216",`
`14`		`- "https://github.com/ggml-org/llama.cpp/pull/25731/commits/453c43816eacc18a6d69dcc4d7fab2966c6951c8"`
	`13`	`+ "https://github.com/ggml-org/llama.cpp/pull/24523/commits/baee0f5b24ec8ceac109ecf07988cb5440c03a6d",`
	`14`	`+ "https://github.com/unslothai/llama.cpp/pull/40/commits/233cedbe9c37df1c9ca7b11634c580e45974b046"`
`15`	`15`	`]`
`16`	`16`	`}`