Prebuilt: refresh stale PR pins for #24523 and #25731 - #39
Merged
Conversation
Both pins pointed at commits that no longer merge onto the selected upstream base, so the nightly full release build failed while resolving the PR set. ggml-org#24523 was pinned to 66f43aa, which was not even the PR head at the time (the resolver logged that the head had moved to 0b78558). That commit conflicts in common/chat.cpp against both b10107 and b10133. The PR has since been rebased onto current master, so the pin now points at its new head a58a7fa, which merges cleanly. ggml-org#25731 was pinned to ce16fff, which conflicts on its own in ggml/src/ggml-cuda/mmq.cuh, src/llama-model-saver.cpp and src/llama-vocab.h. This never surfaced in the log because the resolver stops at the first failing entry. Its current head 453c438 merges cleanly by itself. Note that ggml-org#24523 and ggml-org#25731 still conflict with each other in common/chat.cpp and src/llama-arch.h: both append a new llm_arch enum value immediately before LLM_ARCH_UNKNOWN and both add a chat parser in the same region. Reordering does not help, since whichever entry is applied second hits the same conflict. Resolving that needs a decision about which of the two to carry, so it is left alone here. Requires a base of b10133 or newer: b10107 predates the rename of common_chat_params::thinking_end_tag to thinking_end_tags, which the rebased ggml-org#24523 depends on.
This was referenced Jul 26, 2026
danielhanchen
added a commit
that referenced
this pull request
Jul 26, 2026
#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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The nightly full release build fails while resolving the PR set:
Both of the last two pins were stale. Verified by replaying the merge sequence locally against the real bases.
ggml-org#24523 (MiniMax-M3)
Pinned to
66f43aa6, which was not even the PR head at the time. The resolver logged this itself:That commit conflicts in
common/chat.cppagainst bothb10107andb10133. The PR has since been rebased onto current master, so this repins to its new heada58a7fa6, which merges cleanly.ggml-org#25731 (TML Inkling)
Pinned to
ce16fff2, which conflicts on its own ontob10133inggml/src/ggml-cuda/mmq.cuh,src/llama-model-saver.cppandsrc/llama-vocab.h. This never appeared in the log because the resolver stops at the first failing entry, which was ggml-org#24523. Its current head453c4381merges cleanly by itself.Result
Known remaining conflict
ggml-org#24523 and ggml-org#25731 conflict with each other. Both append a new
llm_archvalue immediately beforeLLM_ARCH_UNKNOWN(LLM_ARCH_MINIMAX_M3andLLM_ARCH_INKLING) and both add a chat parser in the same region ofcommon/chat.cpp.Reordering does not help, since whichever entry is applied second hits the identical conflict:
So this PR does not make the nightly green on its own. It fixes the two stale pins and moves the failure from ggml-org#24523 to ggml-org#25731. Deciding which of the two to carry is a separate call.
Base requirement
The rebased ggml-org#24523 needs a base of
b10133or newer.b10107predates the rename ofcommon_chat_params::thinking_end_tagtothinking_end_tags, which the rebased branch depends on.b10133is the first tag containing that rename, and the resolver picks the newest release aged at least 6h, so this is satisfied from today onward.