Just announced on the OSHWA site, the OSI and OSHWA have signed a co-existence agreement around the use of the community generated open source hardware logo. From the announcement:
This agreement means that each group separately has control of their respective logo and in particular that the Open Source Hardware community will be able to continue to use the Open Source Hardware logo.
We’re very happy that the open source communities were able to work together on this issue.