From 607213a52ea3da11ac4d12c0a14b89bc82935b23 Mon Sep 17 00:00:00 2001 From: sudhanshukumar22 <51457531+sudhanshukumar22@users.noreply.github.com> Date: Tue, 1 Apr 2025 22:34:05 +0530 Subject: [PATCH 1/2] [202411][FRR] Port Fix from FRR community for issue #18493 [202411][FRR] Port Fix from FRR community for issue #18493 --- ...ch => 0142-lib-Return-duplicate-prefix-list-entry-test.patch} | 0 src/sonic-frr/patch/series | 1 + 2 files changed, 1 insertion(+) rename src/sonic-frr/patch/{0063-lib-Return-duplicate-prefix-list-entry-test.patch => 0142-lib-Return-duplicate-prefix-list-entry-test.patch} (100%) diff --git a/src/sonic-frr/patch/0063-lib-Return-duplicate-prefix-list-entry-test.patch b/src/sonic-frr/patch/0142-lib-Return-duplicate-prefix-list-entry-test.patch similarity index 100% rename from src/sonic-frr/patch/0063-lib-Return-duplicate-prefix-list-entry-test.patch rename to src/sonic-frr/patch/0142-lib-Return-duplicate-prefix-list-entry-test.patch diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index fe2b480257..db2095cd1a 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -121,3 +121,4 @@ 0139-lib-add-helpers-to-print-json-keys.patch 0140-zebra-fix-show-route-vrf-all-memory-consumption.patch 0141-zebra-fix-show-route-memory-consumption.patch +0142-lib-Return-duplicate-prefix-list-entry-test.patch From e59892ac0edd0d478364fbe6d67f046bfe7463f9 Mon Sep 17 00:00:00 2001 From: r12f Date: Wed, 20 Aug 2025 16:28:41 +0000 Subject: [PATCH 2/2] Cherry pick [202411][FRR] fix FRR mgmtd losing configuration issue --- ...0143-mgmtd-clean-session-config-only-when-it-is-needed.patch} | 0 src/sonic-frr/patch/series | 1 + 2 files changed, 1 insertion(+) rename src/sonic-frr/patch/{0064-mgmtd-clean-session-config-only-when-it-is-needed.patch => 0143-mgmtd-clean-session-config-only-when-it-is-needed.patch} (100%) diff --git a/src/sonic-frr/patch/0064-mgmtd-clean-session-config-only-when-it-is-needed.patch b/src/sonic-frr/patch/0143-mgmtd-clean-session-config-only-when-it-is-needed.patch similarity index 100% rename from src/sonic-frr/patch/0064-mgmtd-clean-session-config-only-when-it-is-needed.patch rename to src/sonic-frr/patch/0143-mgmtd-clean-session-config-only-when-it-is-needed.patch diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index db2095cd1a..fa02ff1bc4 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -122,3 +122,4 @@ 0140-zebra-fix-show-route-vrf-all-memory-consumption.patch 0141-zebra-fix-show-route-memory-consumption.patch 0142-lib-Return-duplicate-prefix-list-entry-test.patch +0143-mgmtd-clean-session-config-only-when-it-is-needed.patch