Merge pull request #14561 from idryzhov/implicit-fallthrough

author Donald Sharp <donaldsharp72@gmail.com>

Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)

committer GitHub <noreply@github.com>

Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)
author Donald Sharp <donaldsharp72@gmail.com>
Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)
committer GitHub <noreply@github.com>
Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)
diff --cc nhrpd/nhrp_peer.c
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Donald Sharp <donaldsharp72@gmail.com>
	Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)
committer	GitHub <noreply@github.com>
	Fri, 13 Oct 2023 15:51:11 +0000 (11:51 -0400)
		1	2
nhrpd/nhrp_peer.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history