Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	README.md
#	docs/backend/SYCL.md
#	docs/docker.md
#	ggml/src/ggml-webgpu/CMakeLists.txt
#	ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
#	ggml/src/ggml-webgpu/ggml-webgpu.cpp
#	ggml/src/ggml-webgpu/pre_wgsl.hpp
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn.wgsl
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_tile.wgsl
#	ggml/src/ggml-webgpu/wgsl-shaders/flash_attn_vec_split.wgsl
#	ggml/src/ggml-webgpu/wgsl-shaders/mul_mat_decls.tmpl
#	tests/test-backend-ops.cpp
#	tests/test-save-load-state.cpp
#	tools/CMakeLists.txt

tools/server/server-http.h

@@ -7,6 +7,7 @@
 #include <thread>
 #include <vector>
 #include <cstdint>
+#include <unordered_map>
 
 struct common_params;