Prebuilt: drop the merged #26841 pin, it now conflicts with the base - #90
Merged
Conversation
…he base Upstream squash-merged ggml-org#26841 as 62bf73d, which is an ancestor of b10356. The pinned commit 56b32b3 is not, so resolve re-applies the same Muse Glimmer code the base already carries and additive_merge.py correctly refuses it as one change made twice. The nightly stops there. Replayed the resolve merge locally on b10356 with the pin still in place: refused common/speculative.cpp: merge base is not empty, so at least one side edited existing text refused conversion/muse_glimmer.py: both sides add the same line(s), so this is one change made twice refused src/models/muse-glimmer.cpp: both sides add the same line(s) ggml-org#26841 (56b32b3) does not merge cleanly onto b10356 + the PRs listed before it Nothing is lost by dropping it. b10356 carries Muse Glimmer at upstream's final state, which is two lines ahead of the pinned commit, not behind. The _doc said a merged pin becomes an empty no-op. That only holds when upstream takes the PR as a merge commit, and upstream usually squashes, so the note now says to delete the entry once a base tag carries the work.
This was referenced Aug 11, 2026
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
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.
Upstream squash-merged
ggml-org#26841(Muse Glimmer) as62bf73d25, and that commit is an ancestor of the current base tagb10356. The pinned commit56b32b3eis not an ancestor of anything in the base, soresolvere-applies Muse Glimmer on top of a tree that already has it, andadditive_merge.pyrefuses it, correctly, as one change made twice.Tonight's nightly stops on this pin. Replaying the resolve merge locally against
b10356withpr-set.jsonexactly as it is on master:The three pins before it merge fine, so this is the only thing in the way.
Nothing is lost by dropping it
b10356carries the architecture at upstream's final merged state, which is slightly ahead of what we pinned:So the base is two lines ahead of the pin, not behind it.
LLM_ARCH_MUSE_GLIMMER,src/models/muse-glimmer.cpp,tools/mtmd/models/muse-glimmer.cppandconversion/muse_glimmer.pyare all present in the merged tree with the pin removed, and the builtlibllama.soandlibmtmd.sostill export the symbols.The
_docwas misleadingThe note said a merged pin becomes an empty no-op once the base contains it, so it could be deleted at leisure. That only holds if upstream takes the PR as a real merge commit. Upstream usually squashes, and a squash shares no history with the pinned commit, so instead of going quiet the pin turns into a hard build failure the day the base tag catches up. The note now says that, and says to delete the entry once a base tag carries the work rather than waiting for it to rot away.
Checks
Merged tree on
b10356with this change: 24423, 25731 and 70 all merge, build completes with CUDA (sm_100), 59 of 60 ctest pass, andtest-backend-opspasses separately at 1219/1219 forMUL_MATand 874/874 forMUL_MAT_IDon CUDA0. The one ctest entry not counted istest-backend-opsitself hitting the 1500s ctest timeout, which is why it was run on its own.