]> git.ipfire.org Git - thirdparty/iproute2.git/commit
Merge remote-tracking branch 'main/main' into next
authorDavid Ahern <dsahern@kernel.org>
Sat, 5 Oct 2024 23:06:06 +0000 (23:06 +0000)
committerDavid Ahern <dsahern@kernel.org>
Sat, 5 Oct 2024 23:06:06 +0000 (23:06 +0000)
commit0fb4ef8bbbf536bd972cb92829730a64f6e4c5ae
tree488c51b26a0e13b4c84d33248cb0999dc8f330f3
parent031922c8a302d86d928c5083a9b7732a58e5f5d5
parentb32ac38cc49d377715f28b58cbeeb4086cbb9f7b
Merge remote-tracking branch 'main/main' into next

Fixed conflicts in lib/utils.c

Signed-off-by: David Ahern <dsahern@kernel.org>
include/utils.h
lib/utils.c