Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zebra: Pass in ZEBRA_ROUTE_MAX instead of true (backport #16881) #16884

Closed
wants to merge 1 commit into from
Closed

zebra: Pass in ZEBRA_ROUTE_MAX instead of true (backport #16881) #16884

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 20, 2024

zebra_nhg_install_kernel takes a route type. We don't know it at that particular spot but we should not be passing in true. Let's use ZEBRA_ROUTE_MAX to indicate we do not know, so that the correct thing is done.

This is an automatic backport of pull request #16881 done by Mergify.

@donaldsharp @mergify
zebra: Pass in ZEBRA_ROUTE_MAX instead of true
99b45c1 
zebra_nhg_install_kernel takes a route type.  We don't
know it at that particular spot but we should not be passing
in `true`.  Let's use ZEBRA_ROUTE_MAX to indicate we do not
know, so that the correct thing is done.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit 58722b9)

# Conflicts:
#	zebra/zebra_nhg.c
@mergify Mergify
Copy link
Author

mergify bot commented Sep 20, 2024

Cherry-pick of 58722b9 has failed:

On branch mergify/bp/stable/10.0/pr-16881
Your branch is up to date with 'origin/stable/10.0'.

You are currently cherry-picking commit 58722b9448.
  (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:   zebra/zebra_nhg.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

@mergify mergify bot added the conflicts label Sep 20, 2024
@frrbot frrbot bot added the zebra label Sep 20, 2024
@mergify mergify bot mentioned this pull request Sep 20, 2024
Merged
@Jafaral Jafaral closed this Sep 20, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.0/pr-16881 branch October 25, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
size/XS stable/10.0 zebra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Jafaral @donaldsharp