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

bgpd, lib: Include SID structure in seg6local nexthop (backport #16835) #17016

Closed
wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 7, 2024

Include SID structure information when installing/removing an SRv6 SID in/from the forwarding plane.


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

Include SID structure information in seg6local nexthop data structure.

Signed-off-by: Carmine Scarpitta <[email protected]>
(cherry picked from commit 0402551)
Include SID structure information when installing an SRv6 End.DT6 or End.DT4 SID
in the forwarding plane.

Signed-off-by: Carmine Scarpitta <[email protected]>
(cherry picked from commit 6343fe3)
Include SID structure information when installing an SRv6 End.DT46 SID
in the forwarding plane.

Signed-off-by: Carmine Scarpitta <[email protected]>
(cherry picked from commit 949ea04)
Include SID structure information when removing an SRv6 End.DT4 or End.DT6 SID
from the forwarding plane.

Signed-off-by: Carmine Scarpitta <[email protected]>
(cherry picked from commit a764fb9)

# Conflicts:
#	bgpd/bgp_mplsvpn.c
Include SID structure information when removing an SRv6 End.DT46 SID
from the forwarding plane.

Signed-off-by: Carmine Scarpitta <[email protected]>
(cherry picked from commit 1587169)

# Conflicts:
#	bgpd/bgp_mplsvpn.c
@mergify mergify bot added the conflicts label Oct 7, 2024
Copy link
Author

mergify bot commented Oct 7, 2024

Cherry-pick of a764fb9 has failed:

On branch mergify/bp/stable/10.1/pr-16835
Your branch is ahead of 'origin/stable/10.1' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a764fb9bd8.
  (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_mplsvpn.c

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 1587169 has failed:

On branch mergify/bp/stable/10.1/pr-16835
Your branch is ahead of 'origin/stable/10.1' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1587169214.
  (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_mplsvpn.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

@ton31337 ton31337 closed this Oct 7, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-16835 branch October 7, 2024 08:14
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