Applied the following patches from the upstream hwloc 1.11 branch after
the v1.11.0 release: