Merge pull request #15797 from pguibert6WIND/isis_srv6_ls_subnet

author Russ White <russ@riw.us>

Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)

committer GitHub <noreply@github.com>

Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)
author Russ White <russ@riw.us>
Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)
committer GitHub <noreply@github.com>
Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)
diff --cc isisd/isis_te.c
Simple merge
diff --cc isisd/isis_te.h
Simple merge
author	Russ White <russ@riw.us>
	Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)
committer	GitHub <noreply@github.com>
	Fri, 26 Jul 2024 18:45:01 +0000 (14:45 -0400)
		1	2
isisd/isis_te.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_te.h	patch \|	diff1 \|	diff2 \|	blob \| history