Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	src/utils_db_query.c
	src/zfs_arc.c

diff --cc configure.in
Simple merge

diff --cc src/collectd.c
Simple merge

diff --cc src/common.c
Simple merge

diff --cc src/exec.c
Simple merge

diff --cc src/netlink.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/unixsock.c
Simple merge

diff --cc src/utils_db_query.c
Simple merge

diff --cc src/zfs_arc.c
index 8341be0,79a234f..f886c86
--- 1/src/zfs_arc.c
--- 2/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -77,17 -90,11 +77,18 @@@ static void za_submit_ratio (const char
  
  static int za_read (void)
  {
 -      gauge_t   arcsize, targetsize, minlimit, maxlimit, hits, misses, l2_size, l2_hits, l2_misses;
 -      counter_t demand_data_hits, demand_metadata_hits, prefetch_data_hits, prefetch_metadata_hits;
 -      counter_t demand_data_misses, demand_metadata_misses, prefetch_data_misses, prefetch_metadata_misses;
 -      counter_t l2_read_bytes, l2_write_bytes;
 +      gauge_t  arc_size, l2_size;
 +      derive_t demand_data_hits,
 +               demand_metadata_hits,
 +               prefetch_data_hits,
 +               prefetch_metadata_hits,
 +               demand_data_misses,
 +               demand_metadata_misses,
 +               prefetch_data_misses,
 +               prefetch_metadata_misses;
 +      gauge_t  arc_hits, arc_misses, l2_hits, l2_misses;
 +      value_t  l2_io[2];
+       kstat_t  *ksp   = NULL;
  
        get_kstat (&ksp, "zfs", 0, "arcstats");
        if (ksp == NULL)