<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<META NAME="Generator" CONTENT="MS Exchange Server version 5.5.2654.45">
<TITLE>RE: [openib-general] OpenSM: new branch</TITLE>
</HEAD>
<BODY>
<P><FONT SIZE=2>Hello Hal,</FONT>
</P>
<P><FONT SIZE=2>Since the merge or the OpenSM to the main trunk is going to be long, we tried to come</FONT>
<BR><FONT SIZE=2>up with a way to make it clearer and easier to review.</FONT>
<BR><FONT SIZE=2>Currently we have the osm-1.8.0-merge branch, that includes all the merges. We gave special attention</FONT>
<BR><FONT SIZE=2>to make sure fixes done on the main trunk will not be lost in the process. </FONT>
<BR><FONT SIZE=2>During the main trunk update, this branch can be used to validate the merge.</FONT>
</P>
<P><FONT SIZE=2>Regarding the merge: </FONT>
<BR><FONT SIZE=2>As we tried to do the merge patch by patch with no success, we would like to propose an alternative</FONT>
<BR><FONT SIZE=2>stategy for making sure all changes are reviewed.</FONT>
<BR><FONT SIZE=2>We think the merge should be split to reasonable sized chunks, and applied on each section separately</FONT>
<BR><FONT SIZE=2>even at the cost of breaking the code at several stages.</FONT>
<BR><FONT SIZE=2>We believe that the effort of merging all the changes without breaking the compilation is too big, since</FONT>
<BR><FONT SIZE=2>many changes involve multiple files.</FONT>
<BR><FONT SIZE=2>We think the following partition could be useful: </FONT>
<BR><FONT SIZE=2>1. New and deleted files.</FONT>
<BR><FONT SIZE=2>2. Build environment changes</FONT>
<BR><FONT SIZE=2>3. Complib Include and Code.</FONT>
<BR><FONT SIZE=2>4. Vendor Modifications Include and Code.</FONT>
<BR><FONT SIZE=2>5. OpenSM headers and ib_types.h.</FONT>
<BR><FONT SIZE=2>6. OpenSM core - SM part.</FONT>
<BR><FONT SIZE=2>7. OpenSM core SA part (actually can be done one file at a time)</FONT>
</P>
<P><FONT SIZE=2>The attached file provides the list of the files for each step, such that obtaining the patch for each step is </FONT>
<BR><FONT SIZE=2>made simpler.</FONT>
<BR><FONT SIZE=2>We, of course, will be happy to help in creating the patches, and assist in any way possible to make this</FONT>
<BR><FONT SIZE=2>merge a smooth as possible.</FONT>
</P>
<P><FONT SIZE=2>Thanks,</FONT>
<BR><FONT SIZE=2>Yael</FONT>
</P>
<P><FONT FACE="Arial" SIZE=2 COLOR="#000000"></FONT>
</BODY>
</HTML>