Skip to content

T6977: FRR patch for 'no encapsulation' command#1115

Merged
sever-sever merged 2 commits intovyos:currentfrom
hedrok:T6977-frr-add-no-encap-cmd
Feb 9, 2026
Merged

T6977: FRR patch for 'no encapsulation' command#1115
sever-sever merged 2 commits intovyos:currentfrom
hedrok:T6977-frr-add-no-encap-cmd

Conversation

@hedrok
Copy link
Contributor

@hedrok hedrok commented Feb 7, 2026

FRR patch to add 'no encapsulation' command

Patch adds command 'no encapsulation' under segment-routing/srv6

The patch is already merged upstream: FRRouting/frr#20716

Also remove patches

  • 0013-Revert-bgpd-Ensure-incorrect-GR-config-isn-t-display.patch
  • 0015-zebra-fix-crash-on-inactive-VRF-and-import-table.patch

That were backported to FRR 10.5.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

This is PR that needs this change:

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@github-actions
Copy link

github-actions bot commented Feb 7, 2026

👍
No issues in PR Title / Commit Title

@github-actions github-actions bot added the current VyOS rolling release label Feb 7, 2026
Copy link
Member

@c-po c-po left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update our FRR patches. Not everything is yet backported upstream.

@c-po c-po added the bp/circinus Create automatic backport for circinus label Feb 8, 2026
Copy link
Member

@sever-sever sever-sever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch was merged by upstream

@sever-sever sever-sever merged commit 93cad25 into vyos:current Feb 9, 2026
8 checks passed
@vyosbot vyosbot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Feb 9, 2026
@hedrok hedrok deleted the T6977-frr-add-no-encap-cmd branch February 9, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bp/circinus Create automatic backport for circinus current VyOS rolling release mirror-completed

Development

Successfully merging this pull request may close these issues.

4 participants

Comments