hwloc: core: fix the merging of identical objects in presence of Misc objects

If object A contains B + I/O as children, we can "ignore" I/Os and still
try to merge A and B. We now do the same for Misc objects without cpusets
instead of I/Os.

This fixes a corner case when export/reimport to XML creates a slightly
different topology (making hwloc_insert_misc fail inside a Linux cgroup).

Thanks to Dave Love for reporting the problem.

Fixes #118

(cherry picked from commit open-mpi/hwloc@650371e115)
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>

opal/mca/hwloc/hwloc191/hwloc/src/topology.c

@@ -1818,15 +1818,22 @@ merge_useless_child(hwloc_topology_t topology, hwloc_obj_t *pparent)
     /* There are no child, nothing to merge. */
     return;
 
-  if (child->next_sibling && !hwloc_obj_type_is_io(child->next_sibling->type))
+  /* we don't merge if there are multiple "important" children.
-    /* There are several non-I/O children */
+   * non-important ones are at the end of the list.
+   * look at the second child to find out.
+   */
+  if (child->next_sibling
+      /* I/O objects may be ignored when trying to merge */
+      && !hwloc_obj_type_is_io(child->next_sibling->type)
+      /* Misc objects without cpuset may be ignored as well */
+      && !(child->next_sibling->type == HWLOC_OBJ_MISC && !child->next_sibling->cpuset))
+      /* There are several children that prevent from merging */
     return;
 
-  /* There is one non-I/O child and possible some I/O children.
+  /* There is one important child, and some children that may be ignored
-   * I/O children shouldn't prevent merging because they can be attached
+   * during merging because they can be attached to anything with the same locality.
-   * to anything with the same locality.
    * Move them to the side during merging, and append them back later.
-   * This is easy because I/O children are always last in the list.
+   * This is easy because children with no cpuset are always last in the list.
    */
   ios = child->next_sibling;
   child->next_sibling = NULL;
@@ -1873,7 +1880,7 @@ merge_useless_child(hwloc_topology_t topology, hwloc_obj_t *pparent)
   }
 
   if (ios) {
-    /* append I/O children to the list of children of the remaining object */
+    /* append the remaining list of children to the remaining object */
     pchild = &((*pparent)->first_child);
     while (*pchild)
       pchild = &((*pchild)->next_sibling);