diff --git a/NEWS b/NEWS
index 855f762189f6a8bc96a75a91fce68357912cf388..f8a290dcdc57dca34cf5efd5f7234e5b23546610 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ documents those changes that are of interest to users and admins.
  -- BLUEGENE: Reorganized bluegene plugin for maintainability sake.
  -- Major restructuring of data structures in select/cons_res.
  -- Support job, node and partition names of arbitrary size.
+ -- Fix bug that caused slurmd to hang when using select/linear with
+    task/affinity.
 
 * Changes in SLURM 1.3.0-pre7
 =============================
diff --git a/src/common/slurm_resource_info.c b/src/common/slurm_resource_info.c
index 690f8df0bab9b5b0adccaa2f9357b2c3b03096bc..94d545faa6b3654067bb4e7c7856bdf9392bc0e6 100644
--- a/src/common/slurm_resource_info.c
+++ b/src/common/slurm_resource_info.c
@@ -132,6 +132,8 @@ int slurm_get_avail_procs(const uint16_t max_sockets,
 	switch(cr_type) {
 	/* For the following CR types, nodes have no notion of socket, core,
 	   and thread.  Only one level of logical processors */ 
+	case SELECT_TYPE_INFO_NONE:
+		/* Default for select/linear */
 	case CR_CPU:
 	case CR_CPU_MEMORY: