Merge remote-tracking branch 'origin/slurm-2.6'

NEWS

@@ -305,6 +305,7 @@ documents those changes that are of interest to users and admins.
     this would cause pmd's to hang.
  -- NRT - Change xmalloc's to malloc just to be safe.
  -- NRT - Sanity check to make sure a jobinfo is there before packing.
+ -- Add missing options to the print of TaskPluginParam.
 
 * Changes in Slurm 2.6.6
 ========================

doc/man/man5/slurm.conf.5

@@ -2552,11 +2552,11 @@ The default value is "task/none".
 \fBTaskPluginParam\fR
 Optional parameters for the task plugin.
 Multiple options should be comma separated
-If \fBNone\fR, \fBSockets\fR, \fBCores\fR, \fBThreads\fR,
+If \fBNone\fR, \fBBoards\fR, \fBSockets\fR, \fBCores\fR, \fBThreads\fR,
 and/or \fBVerbose\fR are specified, they will override
 the \fB\-\-cpu_bind\fR option specified by the user
 in the \fBsrun\fR command.
-\fBNone\fR, \fBSockets\fR, \fBCores\fR and \fBThreads\fR are mutually
+\fBNone\fR, \fBBoards\fR, \fBSockets\fR, \fBCores\fR and \fBThreads\fR are mutually
 exclusive and since they decrease scheduling flexibility are not generally
 recommended (select no more than one of them).
 \fBCpusets\fR and \fBSched\fR
@@ -2564,6 +2564,10 @@ are mutually exclusive (select only one of them).
 
 .RS
 .TP 10
+\fBBoards\fR
+Always bind to boards.
+Overrides user options or automatic binding.
+.TP
 \fBCores\fR
 Always bind to cores.
 Overrides user options or automatic binding.

src/common/slurm_resource_info.c

@@ -139,6 +139,8 @@ void slurm_sprint_cpu_bind_type(char *str, cpu_bind_type_t cpu_bind_type)
 		strcat(str, "map_ldom,");
 	if (cpu_bind_type & CPU_BIND_LDMASK)
 		strcat(str, "mask_ldom,");
+	if (cpu_bind_type & CPU_BIND_CPUSETS)
+		strcat(str, "cpusets,");
 
 	if (*str) {
 		str[strlen(str)-1] = '\0';	/* remove trailing ',' */