Merge pull request #17324 from keszybz/resolvectl-compat-output

resolvectl compat output

diff --cc src/basic/macro.h
Simple merge

diff --cc src/basic/string-util.h
Simple merge

diff --cc src/resolve/resolvectl.c
Simple merge