From 2196c0680617c4a032b90bdedb12f8ec9b813996 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Tue, 11 Aug 2026 10:53:45 +0000 Subject: [PATCH] Prebuilt: drop the merged #26841 pin, it now conflicts with the base Upstream squash-merged ggml-org#26841 as 62bf73d25, which is an ancestor of b10356. The pinned commit 56b32b3e 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) #26841 (56b32b3e) 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. --- scripts/unsloth/pr-set.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 1bd068d73033..711cfae85244 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -8,7 +8,10 @@ "Closed and merged PRs are STILL merged in. Upstream tags lag their merges and the base is", "aged a further UNSLOTH_LLAMA_MIN_RELEASE_AGE_HOURS, so a pin dropped on merge leaves its arch", "in neither the base nor the mix. Once the base tag contains the commit the merge is an empty", - "no-op, so delete the entry whenever you like. A closed-unmerged pin ships code upstream", + "no-op ONLY if upstream took the PR as a merge commit. Upstream usually squashes, and a squash", + "is not an ancestor of the pinned commit, so the merge re-applies code the base already has and", + "the whole build stops on an unresolvable conflict. Delete the entry once a base tag carries the", + "work, do not wait for it to rot away. A closed-unmerged pin ships code upstream", "declined -- the resolve log warns, but nothing else stops it, so prune those deliberately.", "Use {\"url\": \"...\", \"required\": false} for an entry that should be skipped once it is not open.", "Merging an unslothai PR into fork master drops it from the nightly (the tree is the upstream", @@ -17,7 +20,6 @@ "prs": [ "https://github.com/ggml-org/llama.cpp/pull/24423/commits/daca8075d871483545dd85d58ce11970b304b541", "https://github.com/ggml-org/llama.cpp/pull/25731/commits/0a9841fa63edce1cd252ed6efea713715abb0cf2", - "https://github.com/unslothai/llama.cpp/pull/70/commits/06d2326acbf515b10f8d6abeada09123d361acde", - "https://github.com/ggml-org/llama.cpp/pull/26841/commits/56b32b3e944c461d783604a83beb2cc9b0ca2cf1" + "https://github.com/unslothai/llama.cpp/pull/70/commits/06d2326acbf515b10f8d6abeada09123d361acde" ] }