Merge branch 'project-chip:master' into add_rvc

project-chip · Oct 2, 2023 · 814982f · 814982f
2 parents f1e485d + 7013b09
commit 814982f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-15 : [Silabs] Adds fix for SLC CLI path
+16 : [Telink] Update Docker image (Zephyr update)
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -24,7 +24,7 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr
-ARG ZEPHYR_REVISION=31278e7f9a0103e369e9255f921e04986eb57eb3
+ARG ZEPHYR_REVISION=5e5f3cfde3fb5070b2e6cfb8ab08bc688b5aa3d4
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install -U --no-cache-dir \

diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		15 : [Silabs] Adds fix for SLC CLI path
		16 : [Telink] Update Docker image (Zephyr update)
+2 −2		.github/workflows/codeql.yml
+1 −1		.github/workflows/scorecards.yml
+1 −1		include/openthread/instance.h
+14 −5		include/openthread/link.h
+7 −4		include/openthread/thread_ftd.h
+2 −0		script/test
+1 −1		src/cli/README.md
+215 −5		src/cli/cli.cpp
+88 −0		src/cli/cli_mac_filter.cpp
+52 −20		src/core/border_router/routing_manager.cpp
+40 −10		src/core/border_router/routing_manager.hpp
+22 −0		src/core/config/border_routing.h
+1 −1		src/core/meshcop/joiner.cpp
+3 −1		src/core/net/ip6.cpp
+10 −0		src/core/net/nd6.cpp
+103 −5		src/core/net/nd6.hpp
+3 −2		src/core/thread/address_resolver.hpp
+1 −27		src/core/thread/mle_router.cpp
+1 −1		src/posix/platform/CMakeLists.txt
+3 −1		src/posix/platform/netif.cpp
+92 −0		tests/unit/test_routing_manager.cpp