summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-04-01 23:02:03 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:05 +0200
commite2bbf7ec9f6c9cd64454156d4a87bd6dc68cedd5 (patch)
tree36c71b73be1738897d86877f3e0c9518e04a0e59
parent7e41d7dfd7f7367b79af93f6d23e4273ec2cdc5c (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-e2bbf7ec9f6c9cd64454156d4a87bd6dc68cedd5.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-e2bbf7ec9f6c9cd64454156d4a87bd6dc68cedd5.tar.xz
Kernel-3.8: keep in sync with stable release 3.8.5
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--kernelconfig-3.82
-rw-r--r--patches/linux-3.8/fix_kernels_nick.diff21
-rw-r--r--patches/linux-3.8/patch-3.8.4-5.bz2bin0 -> 34211 bytes
-rw-r--r--patches/linux-3.8/series2
-rw-r--r--patches/linux-3.8/set-marker.diff2
7 files changed, 28 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index f2d1694..2cead79 100644
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,8 @@
- keep in sync with stable release .42
* Kernel 3.4:
- keep in sync with stable release .38
+ * Kernel 3.8:
+ - keep in sync with stable release .5
2013-03-20 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 6fef9cd..0e0b81d 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -32,7 +32,7 @@ they are still available and also some of them are still maintained. Here is a
list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\begin{itemize}
- \item \curKernelRev{}, stable patch level 4 (default)
+ \item \curKernelRev{}, stable patch level 5 (default)
\item 3.7 *), stable patch level 10
\item 3.6 *), stable patch level 11
\item 3.5 *), stable patch level 7
diff --git a/kernelconfig-3.8 b/kernelconfig-3.8
index fe44633..2ede258 100644
--- a/kernelconfig-3.8
+++ b/kernelconfig-3.8
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.8.4-ptx-master Kernel Configuration
+# Linux/arm 3.8.5-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.8/fix_kernels_nick.diff b/patches/linux-3.8/fix_kernels_nick.diff
new file mode 100644
index 0000000..75ead0d
--- /dev/null
+++ b/patches/linux-3.8/fix_kernels_nick.diff
@@ -0,0 +1,21 @@
+This is a temp fix only. I guess changing the nick name in 3.8.5 is a mistake.
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-3.8/Makefile
+===================================================================
+--- linux-3.8.orig/Makefile
++++ linux-3.8/Makefile
+@@ -2,7 +2,7 @@ VERSION = 3
+ PATCHLEVEL = 8
+ SUBLEVEL = 5
+ EXTRAVERSION =
+-NAME = Displaced Humerus Anterior
++NAME = Unicycling Gorilla
+
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
diff --git a/patches/linux-3.8/patch-3.8.4-5.bz2 b/patches/linux-3.8/patch-3.8.4-5.bz2
new file mode 100644
index 0000000..250bb5f
--- /dev/null
+++ b/patches/linux-3.8/patch-3.8.4-5.bz2
Binary files differ
diff --git a/patches/linux-3.8/series b/patches/linux-3.8/series
index f7c0046..7c6e2cf 100644
--- a/patches/linux-3.8/series
+++ b/patches/linux-3.8/series
@@ -3,6 +3,8 @@ patch-3.8.1.bz2
patch-3.8.1-2.bz2
patch-3.8.2-3.bz2
patch-3.8.3-4.bz2
+patch-3.8.4-5.bz2
+fix_kernels_nick.diff
# fix a compilation error. Maybe part of future stable releases
ASoC_samsung_Fix_compilation_error_on_S3C2440.patch
diff --git a/patches/linux-3.8/set-marker.diff b/patches/linux-3.8/set-marker.diff
index 8674f15..adbdc19 100644
--- a/patches/linux-3.8/set-marker.diff
+++ b/patches/linux-3.8/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.8/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 8
- SUBLEVEL = 4
+ SUBLEVEL = 5
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Unicycling Gorilla