I committed (a better version of) this to trunk today. hwloc v1.6 should
work fine in your case. I didn't backport into v1.5.1 because I can't be
100% confident that I am not breaking some cases here. We'll see.