Concedo 5248838a05 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/cann.Dockerfile # .github/workflows/build.yml # .github/workflows/release.yml # .gitignore # README.md # common/CMakeLists.txt # docs/ops.md # docs/ops/Vulkan.csv # examples/eval-callback/eval-callback.cpp # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cpu/CMakeLists.txt # ggml/src/ggml-cpu/arch/x86/repack.cpp # ggml/src/ggml-cpu/kleidiai/kernels.cpp # scripts/sync-ggml.last # src/llama-grammar.cpp # tests/test-backend-ops.cpp # tests/test-chat.cpp # tools/server/CMakeLists.txt		2025-11-22 18:26:13 +08:00
..
main.cpp	Merge branch 'upstream' into concedo_experimental	2025-11-22 18:26:13 +08:00