Okay, I figured out why I had the conflict and fixed it. Patch coming
> On Jul 31, 2015, at 1:23 PM, Brice Goglin <brice.gog...@inria.fr> wrote:
>
> It was renamed from cpuid.h to cpuid-x86.h at some point. Can't check from
> here but the actual code should be the same in all these branches.
> Brice
>
>
> Le 31 juillet 2015 22:19:47 UTC+02:00, Ralph Castain <r...@open-mpi.org> a
> écrit :
> Yo Paul
>
> 1.8.8 and 1.10 do not have hwloc-1.11 in them - they remain on hwloc-1.9. The
> referenced commit doesn’t apply to that version of hwloc because the affected
> file doesn’t exist there.
>
>
>> On Jul 31, 2015, at 9:07 AM, Paul Hargrove <phhargr...@lbl.gov
>> <mailto:phhargr...@lbl.gov>> wrote:
>>
>> My testing has completed all but the last few QEMU-emulated ARM and MIPS
>> platforms.
>> However I do have complete (successful) results from 1 MIPS and 2 ARM
>> platforms at this point.
>>
>> The only issue I encountered is one we learned of with 1.10.0rc2: "pgcc
>> -m32" has issues with some inline asm in hwloc-1.11.0
>> Since h wloc's v1.11 branch has been updated to resolve that issue, I
>> suggest cherry-picking the commit
>> (https://github.com/open-mpi/hwloc/commit/46deaebf
>> <https://github.com/open-mpi/hwloc/commit/46deaebf>) that addresses this
>> particular issue.
>>
>> -Paul
>>
>> --
>> Paul H. Hargrove phhargr...@lbl.gov
>> <mailto:phhargr...@lbl.gov>
>> Computer Languages & Systems Software (CLaSS) Group
>> Computer Science Department Tel: +1-510-495-2352
>> Lawrence Berkeley National Laboratory Fax: +1-510-486-6900
>> _______________________________________________
>> devel mailing list
>> de...@open-mpi.org <mailto:de...@open-mpi.org>
>> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel
>> Link to this post:
>> http://www.open-mpi.org/community/lists/devel/2015/07/17724.php
>
>
>
> devel mailing list
> de...@open-mpi.org
> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel
> <http://www.open-mpi.org/mailman/listinfo.cgi/devel>
> Link to this post:
> http://www.open-mpi.org/community/lists/devel/2015/07/17725.php
> <http://www.open-mpi.org/community/lists/devel/2015/07/17725.php>_______________________________________________
> devel mailing list
> de...@open-mpi.org
> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel
> Link to this post:
> http://www.open-mpi.org/community/lists/devel/2015/07/17726.php
