Merge remote-tracking branch 'origin/main' into fix/gemma4-multimodal-chat-template

abetlen · abetlen · commit 92404dab3215 · 2026-06-04T03:18:36.000-07:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- feat: update llama.cpp to ggml-org/llama.cpp@94a220cd6
 - feat: Generic Multimodal Chat Handler by @abetlen in #2256
+- feat: update llama.cpp to ggml-org/llama.cpp@e3ba22d6c
 - feat(ci): add ROCm wheel builds by @abetlen in #2252
 - feat(ci): add Vulkan wheel builds by @abetlen in #2251
 - fix: handle additional `from_pretrained` files in subfolders by @TNing in #2085
diff --git a/vendor/llama.cpp b/vendor/llama.cpp
@@ -1 +1 @@
-Subproject commit 94a220cd6745e6e3f8de62870b66fd5b9bc92700
+Subproject commit e3ba22d6cc4dec84e59a909c7f96e1689c7384a9
