From 89c2a36701b82608a8e7699c3af86ccb93746785 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Tue, 11 Aug 2026 19:20:20 +0000 Subject: [PATCH] Prebuilt: repin #95 onto an upstream base The first pin for #95 was cut from fork master, whose merge base with the current base tag is from June 10, so merging it dragged in the whole fork/upstream divergence and conflicted across ~1600 files. Rebased the change onto b10359 and repinned to e2e842a. #95 now sits on penalties-upstream-base, matching how #70 and #91 are carried. Verified: all five pins merge onto b10359 in pr-set.json order, #70 via the additive resolver as before, everything else clean. --- scripts/unsloth/pr-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 77663d8aa32..b0e63d1bb95 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -22,6 +22,6 @@ "https://github.com/ggml-org/llama.cpp/pull/25731/commits/0a9841fa63edce1cd252ed6efea713715abb0cf2", "https://github.com/unslothai/llama.cpp/pull/70/commits/06d2326acbf515b10f8d6abeada09123d361acde", "https://github.com/unslothai/llama.cpp/pull/91/commits/c86ed269986f2dced6325c5c58bda966a2e2ead1", - "https://github.com/unslothai/llama.cpp/pull/95/commits/c26185ba22df3e2b3b0f486e80d3274733bd0582" + "https://github.com/unslothai/llama.cpp/pull/95/commits/e2e842a46990765f26cfb5b6c5f1f8e03c3601bc" ] }