Merge pull request #590 from mssonicbld/sonicbld/202412-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412
Azure · Feb 8, 2025 · 4d3de10 · 4d3de10
2 parents e81b285 + 7aedaf9
commit 4d3de10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/platform/marvell/mrvl-prestera b/platform/marvell/mrvl-prestera
diff --git a/platform/marvell/sai.mk b/platform/marvell/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-BRANCH = master
+BRANCH = 202411
 ifeq ($(CONFIGURED_ARCH),arm64)
 MRVL_SAI_VERSION = 1.15.1-1
 else ifeq ($(CONFIGURED_ARCH),armhf)
+6 −5		drivers/armhf/cpssEnabler/linuxNoKernelModule/drivers/intDriver.c
+1 −1		drivers/generic/cpssEnabler/linuxNoKernelModule/drivers/ethDriver.c
+6 −5		drivers/generic/cpssEnabler/linuxNoKernelModule/drivers/intDriver.c