Merge branch 'collectd-5.7'

Conflicts:
	src/intel_rdt.c

diff --cc src/intel_rdt.c
index 2e0fe0fce3833e9c7d9544e4f84e7fcbbb605fd6,6f157b8ffc53cc3bfc5d368593fe64c82c536840..7966daa5e304ebf7d40a12125ba2ffdd34e78c7f
--- 1/src/intel_rdt.c
--- 2/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@@ -568,7 -546,7 +563,7 @@@ static int rdt_config(oconfig_item_t *c
             reports a failure in configuration and
             aborts
           */
-         goto exit;
 -      return (0);
++        return (0);
        }
  
  #if COLLECT_DEBUG
@@@ -580,8 -557,7 +574,7 @@@
      }
    }
  
- exit:
 -  return (0);
 +  return 0;
  }
  
  static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,