[FE training-materials-updates] Kernel labs: now use Linux 4.1
Michael Opdenacker
michael.opdenacker at free-electrons.com
Wed Jul 15 12:28:52 CEST 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=04a017e0fc65fc31ebe8569256aa53858c65d0cf
>---------------------------------------------------------------
commit 04a017e0fc65fc31ebe8569256aa53858c65d0cf
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date: Wed Jul 15 11:50:14 2015 +0200
Kernel labs: now use Linux 4.1
Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
>---------------------------------------------------------------
04a017e0fc65fc31ebe8569256aa53858c65d0cf
labs/kernel-i2c-device-model/kernel-i2c-device-model.tex | 4 ++--
labs/kernel-module-simple/kernel-module-simple.tex | 4 ++--
labs/kernel-serial-iomem/kernel-serial-iomem.tex | 2 +-
labs/kernel-sources-exploring/kernel-sources-exploring.tex | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
index d87df70..4c4d907 100644
--- a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
+++ b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
@@ -17,10 +17,10 @@ device/driver match.
\section{Setup}
Go to the \code{~/linux-kernel-labs/src/linux} directory. Check out the
-\code{3.19.y} branch.
+\code{4.1.y} branch.
Now create a new \code{nunchuk} branch starting from the
-\code{3.19.y} branch, for your upcoming work on the nunchuk
+\code{4.1.y} branch, for your upcoming work on the nunchuk
driver.
\section{Connecting the nunchuk}
diff --git a/labs/kernel-module-simple/kernel-module-simple.tex b/labs/kernel-module-simple/kernel-module-simple.tex
index e06572d..25f1415 100644
--- a/labs/kernel-module-simple/kernel-module-simple.tex
+++ b/labs/kernel-module-simple/kernel-module-simple.tex
@@ -102,7 +102,7 @@ As we are going to make changes to the kernel sources, first create a
special branch for such changes:
\begin{verbatim}
-git checkout 3.19.y
+git checkout 4.1.y
git checkout -b hello
\end{verbatim}
@@ -152,7 +152,7 @@ from the commits between your branch and another branch, usually the
one you started from:
\begin{verbatim}
-git format-patch 3.19.y
+git format-patch 4.1.y
\end{verbatim}
Have a look at the generated file. You can see that its name reused
diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index 15dc261..493ce4f 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -22,7 +22,7 @@ is independent from the nunchuk changes, it's best to create a separate
branch!
\begin{verbatim}
-git checkout 3.19.y
+git checkout 4.1.y
git checkout -b uart
\end{verbatim}
diff --git a/labs/kernel-sources-exploring/kernel-sources-exploring.tex b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
index 43c1ae8..5f9408f 100644
--- a/labs/kernel-sources-exploring/kernel-sources-exploring.tex
+++ b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
@@ -26,18 +26,18 @@ cd ~/linux-kernel-labs/src/linux
git branch -a
\end{verbatim}
-As we want to work with the Linux 3.19 stable branch, the remote branch
-we are interested in is \code{remotes/stable/linux-3.19.y}.
+As we want to work with the Linux 4.1 stable branch, the remote branch
+we are interested in is \code{remotes/stable/linux-4.1.y}.
First, open the \code{Makefile} file just to check the Linux kernel
version that you currently have.
Now, let's create a local branch starting from that remote branch:
\begin{verbatim}
-git checkout -b 3.19.y stable/linux-3.19.y
+git checkout -b 4.1.y stable/linux-4.1.y
\end{verbatim}
-Open \code{Makefile} again and make sure you now have a 3.19.y version.
+Open \code{Makefile} again and make sure you now have a 4.1.y version.
\section{Exploring the sources manually}
More information about the training-materials-updates
mailing list