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.

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

isisd: fix change flex-algorithm number from uint32 to uint8 (backport #17250) #17303

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 30, 2024

The algorithm number is encoded on 8 bits and does not require an unsigned 32 bit value to store the value.

Fixes: cc4926c ("isisd,yang: add algorithm-prefix-sid configuration tree")


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

The algorithm number is encoded on 8 bits and does not require
an unsigned 32 bit value to store the value.

Fixes: cc4926c ("isisd,yang: add algorithm-prefix-sid configuration tree")

Signed-off-by: Philippe Guibert <[email protected]>
(cherry picked from commit 8e861a7)

# Conflicts:
#	isisd/isis_cli.c
#	isisd/isis_nb_config.c
@mergify mergify bot added the conflicts label Oct 30, 2024
Copy link
Author

mergify bot commented Oct 30, 2024

Cherry-pick of 8e861a7 has failed:

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

You are currently cherry-picking commit 8e861a75e8.
  (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)

Changes to be committed:
	modified:   yang/frr-isisd.yang

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   isisd/isis_cli.c
	both modified:   isisd/isis_nb_config.c

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants