Merge branch 'collectd-5.7'

diff --cc contrib/systemd.collectd.service
index 8a1fc27,7bc15d7..4e2f6ae
--- 1/contrib/systemd.collectd.service
--- 2/contrib/systemd.collectd.service
+++ b/contrib/systemd.collectd.service
@@@ -18,9 -18,9 +18,10 @@@ ProtectHome=tru
  #   ceph            CAP_DAC_OVERRIDE
  #   dns             CAP_NET_RAW
  #   exec            CAP_SETUID CAP_SETGID
 +#   intel_rdt       CAP_SYS_RAWIO
  #   iptables        CAP_NET_ADMIN
  #   ping            CAP_NET_RAW
+ #   smart           CAP_SYS_RAWIO
  #   turbostat       CAP_SYS_RAWIO
  #
  # Example, if you use the iptables plugin alongside the dns or ping plugin:

diff --cc src/utils_match.c
Simple merge