Linux development process: improve diagram

- Properly describe the stable and master branches - Rename the diagram file (no longe a "new" process) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
bootlin · Nov 30, 2021 · 6a397c9 · 6a397c9
1 parent 4a9bf17
commit 6a397c9
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 66 deletions.
diff --git a/...ro-versioning/new-development-process.dia → ...-intro-versioning/development-process.dia b/...ro-versioning/new-development-process.dia → ...-intro-versioning/development-process.dia
@@ -460,7 +460,7 @@
         <dia:point val="16.4,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.4,5.94386;17.3463,7.0748"/>
+        <dia:rectangle val="16.4,5.97016;17.32,7.0222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -493,7 +493,7 @@
         <dia:point val="26,6.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.9575,5.83453;27.0688,6.96547"/>
+        <dia:rectangle val="24.9575,5.87398;27.0425,6.92602"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -507,7 +507,7 @@
             <dia:real val="0.89887772703568203"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="26,6.69067"/>
+            <dia:point val="26,6.70382"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -526,7 +526,7 @@
         <dia:point val="29.55,6.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.5075,5.83453;30.6188,6.96547"/>
+        <dia:rectangle val="28.5075,5.87398;30.5925,6.92602"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -540,7 +540,7 @@
             <dia:real val="0.89887772703568203"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="29.55,6.69067"/>
+            <dia:point val="29.55,6.70382"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -559,7 +559,7 @@
         <dia:point val="33.05,6.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.0075,5.83453;34.1188,6.96547"/>
+        <dia:rectangle val="32.0075,5.87398;34.0925,6.92602"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -573,7 +573,7 @@
             <dia:real val="0.89887772703568203"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="33.05,6.69067"/>
+            <dia:point val="33.05,6.70382"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -592,7 +592,7 @@
         <dia:point val="36.55,6.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.5075,5.83453;37.6188,6.96547"/>
+        <dia:rectangle val="35.5075,5.87398;37.5925,6.92602"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -606,7 +606,7 @@
             <dia:real val="0.89887772703568203"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="36.55,6.69067"/>
+            <dia:point val="36.55,6.70382"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -625,7 +625,7 @@
         <dia:point val="40.05,6.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.0075,5.83453;41.1188,6.96547"/>
+        <dia:rectangle val="39.0075,5.87398;41.0925,6.92602"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -639,7 +639,7 @@
             <dia:real val="0.89887772703568203"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="40.05,6.69067"/>
+            <dia:point val="40.05,6.70382"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -658,7 +658,7 @@
         <dia:point val="42.975,6.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.975,5.74386;43.9213,6.8748"/>
+        <dia:rectangle val="42.975,5.77016;43.895,6.8222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -790,17 +790,15 @@
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.225,3"/>
+        <dia:point val="43.975,9.525"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.225,2.26144;47.575,4.79776"/>
+        <dia:rectangle val="43.975,8.78644;48.5525,9.72276"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#Linus
-development
-process#</dia:string>
+            <dia:string>#5.1 stable branch#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -809,7 +807,7 @@ process#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="44.225,3"/>
+            <dia:point val="43.975,9.525"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000ff"/>
@@ -824,45 +822,11 @@ process#</dia:string>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="44.25,8.2"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.25,7.46144;46.3425,9.19776"/>
-      </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#Bug-fix
-versions#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
-          </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="44.25,8.2"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="valign">
-        <dia:enum val="3"/>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="19,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.26,10.7439;19.7663,11.8748"/>
+        <dia:rectangle val="18.26,10.7702;19.74,11.8222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -890,12 +854,12 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O31">
+    <dia:object type="Standard - Text" version="1" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="25,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.26,10.7439;25.7663,11.8748"/>
+        <dia:rectangle val="24.26,10.7702;25.74,11.8222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -923,12 +887,12 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O32">
+    <dia:object type="Standard - Text" version="1" id="O31">
       <dia:attribute name="obj_pos">
         <dia:point val="31.15,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.41,10.7439;31.9163,11.8748"/>
+        <dia:rectangle val="30.41,10.7702;31.89,11.8222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -956,12 +920,12 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O33">
+    <dia:object type="Standard - Text" version="1" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="39,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.26,10.7439;39.7663,11.8748"/>
+        <dia:rectangle val="38.26,10.7702;39.74,11.8222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -989,7 +953,7 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O34">
+    <dia:object type="Standard - Line" version="0" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="43.555,7.09"/>
       </dia:attribute>
@@ -1007,7 +971,7 @@ versions#</dia:string>
         <dia:enum val="4"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O35">
+    <dia:object type="Standard - Line" version="0" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="43.5,12.5"/>
       </dia:attribute>
@@ -1031,7 +995,7 @@ versions#</dia:string>
         <dia:real val="0.5"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O36">
+    <dia:object type="Standard - Line" version="0" id="O35">
       <dia:attribute name="obj_pos">
         <dia:point val="46.05,12.6"/>
       </dia:attribute>
@@ -1046,12 +1010,12 @@ versions#</dia:string>
         <dia:int val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O37">
+    <dia:object type="Standard - Text" version="1" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="46.05,14.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.31,13.3439;46.8163,14.4748"/>
+        <dia:rectangle val="45.31,13.3702;46.79,14.4222"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1079,7 +1043,7 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O38">
+    <dia:object type="Standard - Text" version="1" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="24.28,7.975"/>
       </dia:attribute>
@@ -1112,5 +1076,99 @@ versions#</dia:string>
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="44.025,11.9936"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="44.025,11.2316;48.6259,12.2381"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#5.2 stable branch#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="44.025,11.9936"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000ff"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="43.55,5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="43.5,4.64182;48.2,5.36543"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="43.55,5"/>
+        <dia:point val="48.15,5.0043"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="7"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O40">
+      <dia:attribute name="obj_pos">
+        <dia:point val="43.9,3.78106"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="43.9,3.01909;50.2734,4.82563"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#Development (master)
+branch (Linus Torvalds)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="43.9,3.78106"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000ff"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
   </dia:layer>
 </dia:diagram>
diff --git a/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex b/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
@@ -26,7 +26,7 @@ \subsection{Linux versioning scheme and development process}
   \frametitle{Linux development model}
   Using merge and bug fixing windows
   \begin{center}
-    \includegraphics[width=\textwidth]{slides/sysdev-linux-intro-versioning/new-development-process.pdf}
+    \includegraphics[width=\textwidth]{slides/sysdev-linux-intro-versioning/development-process.pdf}
   \end{center}
 \end{frame}