Merge branch 'main' into next

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --cc devlink/devlink.c
Simple merge

diff --cc include/utils.h
Simple merge

diff --cc lib/fs.c
Simple merge

diff --cc man/man8/ip-link.8.in
Simple merge