]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge remote-tracking branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Tue, 29 Aug 2023 02:54:04 +0000 (20:54 -0600)
committerDavid Ahern <dsahern@kernel.org>
Tue, 29 Aug 2023 02:54:04 +0000 (20:54 -0600)
Signed-off-by: David Ahern <dsahern@kernel.org>
1  2 
misc/ss.c

diff --cc misc/ss.c
Simple merge