[FE training-materials-updates] Mention Linux 4.x versions
Michael Opdenacker
michael.opdenacker at free-electrons.com
Fri Dec 11 08:31:36 CET 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=bfad47dbe18b7a319bc37b688cedc0409b61177c
>---------------------------------------------------------------
commit bfad47dbe18b7a319bc37b688cedc0409b61177c
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date: Fri Dec 11 08:31:17 2015 +0100
Mention Linux 4.x versions
Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
>---------------------------------------------------------------
bfad47dbe18b7a319bc37b688cedc0409b61177c
.../longterm-versions.png | Bin 59624 -> 44542 bytes
.../new-development-process.dia | 70 ++++++++++-----------
.../sysdev-linux-intro-versioning.tex | 19 +++---
3 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/slides/sysdev-linux-intro-versioning/longterm-versions.png b/slides/sysdev-linux-intro-versioning/longterm-versions.png
index 8c783d8..937af3e 100644
Binary files a/slides/sysdev-linux-intro-versioning/longterm-versions.png and b/slides/sysdev-linux-intro-versioning/longterm-versions.png differ
diff --git a/slides/sysdev-linux-intro-versioning/new-development-process.dia b/slides/sysdev-linux-intro-versioning/new-development-process.dia
index 4c4fb32..5aea308 100644
--- a/slides/sysdev-linux-intro-versioning/new-development-process.dia
+++ b/slides/sysdev-linux-intro-versioning/new-development-process.dia
@@ -126,7 +126,7 @@
<dia:point val="18.15,3.85"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.15,2.9675;25.005,4.075"/>
+ <dia:rectangle val="18.15,2.755;23.885,4.145"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -159,7 +159,7 @@
<dia:point val="32,3.85"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="32,2.9675;40.14,4.075"/>
+ <dia:rectangle val="32,2.755;38.8475,4.145"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -225,7 +225,7 @@
<dia:point val="20,0.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20,0.005;22.625,0.7525"/>
+ <dia:rectangle val="20,-0.14;22.08,0.8"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -291,7 +291,7 @@
<dia:point val="34,0.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="34,0.005;37.67,0.7525"/>
+ <dia:rectangle val="34,-0.14;36.9325,0.8"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -438,12 +438,12 @@
<dia:point val="16.4,6.8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.4,6.1325;17.5425,6.97"/>
+ <dia:rectangle val="16.4,5.94369;17.3463,7.07512"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.1#</dia:string>
+ <dia:string>#4.1#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -471,12 +471,12 @@
<dia:point val="26,6.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.7325,5.98125;27.2675,6.81875"/>
+ <dia:rectangle val="24.9575,5.83428;27.0688,6.96572"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2-rc1#</dia:string>
+ <dia:string>#4.2-rc1#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -485,7 +485,7 @@
<dia:real val="0.89887772703568203"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26,6.64875"/>
+ <dia:point val="26,6.69059"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -504,12 +504,12 @@
<dia:point val="29.025,6.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.7575,5.98125;30.2925,6.81875"/>
+ <dia:rectangle val="27.9825,5.83428;30.0938,6.96572"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2-rc2#</dia:string>
+ <dia:string>#4.2-rc2#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -518,7 +518,7 @@
<dia:real val="0.89887772703568203"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="29.025,6.64875"/>
+ <dia:point val="29.025,6.69059"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -537,12 +537,12 @@
<dia:point val="34,6.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="32.7325,5.98125;35.2675,6.81875"/>
+ <dia:rectangle val="32.9575,5.83428;35.0688,6.96572"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2-rc3#</dia:string>
+ <dia:string>#4.2-rc3#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -551,7 +551,7 @@
<dia:real val="0.89887772703568203"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="34,6.64875"/>
+ <dia:point val="34,6.69059"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -570,12 +570,12 @@
<dia:point val="37,6.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35.7325,5.98125;38.2675,6.81875"/>
+ <dia:rectangle val="35.9575,5.83428;38.0688,6.96572"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2-rc4#</dia:string>
+ <dia:string>#4.2-rc4#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -584,7 +584,7 @@
<dia:real val="0.89887772703568203"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="37,6.64875"/>
+ <dia:point val="37,6.69059"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -603,12 +603,12 @@
<dia:point val="41,6.4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.7325,5.98125;42.2675,6.81875"/>
+ <dia:rectangle val="39.9575,5.83428;42.0688,6.96572"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2-rc5#</dia:string>
+ <dia:string>#4.2-rc5#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -617,7 +617,7 @@
<dia:real val="0.89887772703568203"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="41,6.64875"/>
+ <dia:point val="41,6.69059"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -636,12 +636,12 @@
<dia:point val="44.4,6.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="44.4,5.9325;45.5425,6.77"/>
+ <dia:rectangle val="44.4,5.74369;45.3463,6.87512"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2#</dia:string>
+ <dia:string>#4.2#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -774,7 +774,7 @@
<dia:point val="47,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="47,2.405;51.2275,4.7525"/>
+ <dia:rectangle val="47,2.26;50.35,4.8"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -809,7 +809,7 @@ process#</dia:string>
<dia:point val="47,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="47,9.405;49.6775,10.9525"/>
+ <dia:rectangle val="47,9.26;49.0925,11"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -843,12 +843,12 @@ versions#</dia:string>
<dia:point val="19,11.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.0862,10.9325;19.9138,11.77"/>
+ <dia:rectangle val="18.26,10.7437;19.7663,11.8751"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.1.1#</dia:string>
+ <dia:string>#4.1.1#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -876,12 +876,12 @@ versions#</dia:string>
<dia:point val="25,11.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.0862,10.9325;25.9138,11.77"/>
+ <dia:rectangle val="24.26,10.7437;25.7663,11.8751"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.1.2#</dia:string>
+ <dia:string>#4.1.2#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -909,12 +909,12 @@ versions#</dia:string>
<dia:point val="31,11.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.0862,10.9325;31.9138,11.77"/>
+ <dia:rectangle val="30.26,10.7437;31.7663,11.8751"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.1.3#</dia:string>
+ <dia:string>#4.1.3#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -942,12 +942,12 @@ versions#</dia:string>
<dia:point val="39,11.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="38.0862,10.9325;39.9138,11.77"/>
+ <dia:rectangle val="38.26,10.7437;39.7663,11.8751"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.1.4#</dia:string>
+ <dia:string>#4.1.4#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -1032,12 +1032,12 @@ versions#</dia:string>
<dia:point val="47.4,14.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="46.4863,13.5325;48.3138,14.37"/>
+ <dia:rectangle val="46.66,13.3437;48.1663,14.4751"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#3.2.1#</dia:string>
+ <dia:string>#4.2.1#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="Latin Modern Sans" style="0" name="Courier"/>
diff --git a/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex b/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
index 14b29f7..581dcc1 100644
--- a/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
+++ b/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
@@ -40,16 +40,17 @@
\end{frame}
\begin{frame}
- \frametitle{3.x stable branch}
+ \frametitle{Versions since 2.6.0}
\begin{itemize}
\item From 2003 to 2011, the official kernel versions were named \code{2.6.x}.
\item Linux \code{3.0} was released in July 2011
+ \item Linux \code{4.0} was released in April 2015
\item This is only a change to the numbering scheme
\begin{itemize}
- \item Official kernel versions are now named \code{3.x}
- (\code{3.0, 3.1, 3.2}, etc.)
- \item Stabilized versions are named \code{3.x.y}
- (\code{3.0.2, 3.4.3}, etc.)
+ \item Official kernel versions are now named \code{x.y}
+ (\code{3.0, 3.1, 3.2, ..., 3.19, 4.0, 4.1}, etc.)
+ \item Stabilized versions are named \code{x.y.z}
+ (\code{3.0.2, 4.2.7}, etc.)
\item It effectively only removes a digit compared to the previous
numbering scheme
\end{itemize}
@@ -67,14 +68,14 @@
\begin{frame}
\frametitle{New development model - Details}
\begin{itemize}
- \item After the release of a \code{3.x} version (for example),
+ \item After the release of a \code{4.x} version (for example),
a two-weeks merge window opens, during which major additions are merged.
\item The merge window is closed by the release of test version
- \code{3.(x+1)-rc1}
+ \code{4.(x+1)-rc1}
\item The bug fixing period opens, for 6 to 10 weeks.
\item At regular intervals during the bug fixing period,
- \code{3.(x+1)-rcY} test versions are released.
- \item When considered sufficiently stable, kernel \code{3.(x+1)}
+ \code{4.(x+1)-rcY} test versions are released.
+ \item When considered sufficiently stable, kernel \code{4.(x+1)}
is released, and the process starts again.
\end{itemize}
\end{frame}
More information about the training-materials-updates
mailing list