Merge proposals

hwloc-contrib in Ubuntu has no merge proposals.