Merge pull request sonic-net#484 from mssonicbld/sonicbld/202405-merge

mssonicbld · web-flow · commit 7460d1a49e79 · 2024-12-28T11:32:59.000+08:00
[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 11.2.18.2
+LIBSAIBCM_XGS_VERSION = 11.2.20.1
 LIBSAIBCM_DNX_VERSION = 11.2.18.1
 
 LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.0_GA
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -29,7 +29,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get install -y \
 {%- if ENABLE_ASAN == "y" %}
-        libasan6 \
+        libasan8 \
 {%- endif %}
         libxml2 \
         python3-pip \
diff --git a/src/dhcpmon b/src/dhcpmon
@@ -1 +1 @@
-Subproject commit 22a7467a8ab3e26c3d20e959a0702380f0d4b5ae
+Subproject commit 073033a0ff5ff4edaad6c4d4319bed77e83ba54a

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-LIBSAIBCM_XGS_VERSION = 11.2.18.2`
	`1`	`+LIBSAIBCM_XGS_VERSION = 11.2.20.1`
`2`	`2`	`LIBSAIBCM_DNX_VERSION = 11.2.18.1`
`3`	`3`
`4`	`4`	`LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.0_GA`