Closed mergify[bot] closed 6 days ago
Cherry-pick of fa2cc09d45d3f843564f7bd1e02346373c5741a8 has failed:
On branch mergify/bp/stable/8.5/pr-16305
Your branch is up to date with 'origin/stable/8.5'.
You are currently cherry-picking commit fa2cc09d45.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: bgpd/bgp_route.c
no changes added to commit (use "git add" and/or "git commit -a")
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Created a manual backport here https://github.com/FRRouting/frr/pull/16324, closing this.
Closes https://github.com/FRRouting/frr/issues/16304
This is an automatic backport of pull request #16305 done by Mergify.