Merge pull request #18623 from cscarpitta/feature/srv6_encap_mode_reduced

author Russ White <russ@riw.us>

Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)

committer GitHub <noreply@github.com>

Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)
author Russ White <russ@riw.us>
Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)
committer GitHub <noreply@github.com>
Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)
diff --cc lib/zclient.c
Simple merge
diff --cc zebra/zebra_nhg.c
Simple merge
author	Russ White <russ@riw.us>
	Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)
committer	GitHub <noreply@github.com>
	Thu, 1 May 2025 21:13:00 +0000 (17:13 -0400)
		1	2
lib/zclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_nhg.c	patch \|	diff1 \|	diff2 \|	blob \| history