From 524d806205af378cd012cde0dd34913d7024894b Mon Sep 17 00:00:00 2001 From: Daniel Han Date: Sun, 26 Jul 2026 11:19:31 +0000 Subject: [PATCH] Prebuilt: refresh stale PR pins for #24523 and #25731 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/llama.cpp#24523 was pinned to 66f43aa6, which was not even the PR head at the time (the resolver logged that the head had moved to 0b78558a). 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 a58a7fa6, which merges cleanly. ggml-org/llama.cpp#25731 was pinned to ce16fff2, 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 453c4381 merges cleanly by itself. Note that #24523 and #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 #24523 depends on. --- 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 2f67d797e58e..868c029cbaf3 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/66f43aa655a07999c7746fe9ff5ede94835e921e", - "https://github.com/ggml-org/llama.cpp/pull/25731/commits/ce16fff2ad1d1ddfb39365fedfb4fcfd6db178f1" + "https://github.com/ggml-org/llama.cpp/pull/24523/commits/a58a7fa6e89f9564f78caaf1f858c810c070b216", + "https://github.com/ggml-org/llama.cpp/pull/25731/commits/453c43816eacc18a6d69dcc4d7fab2966c6951c8" ] } \ No newline at end of file