Kernel-3.14: keep in sync with stable release .13

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>

18 files changed, 41 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index c59e164..22c9a41 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -8,6 +8,8 @@
 		- mark this kernel as broken on the Mini2440
 	* Kernel 3.12:
 		- keep in sync with stable release .24
+	* Kernel 3.14:
+		- keep in sync with stable release .13
 
 2014-04-30	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
index 9ad2c84..dc9e71c 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.2-ptx-master Kernel Configuration
+# Linux/arm 3.14.13-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/fix_name.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/fix_name.diff
new file mode 100644
index 0000000..9abdba4
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/fix_name.diff
@@ -0,0 +1,23 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Subject: Keep the 3.14 kernel name.
+
+Don't know why it was changed.
+
+Singed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-3.14/Makefile
+===================================================================
+--- linux-3.14.orig/Makefile
++++ linux-3.14/Makefile
+@@ -2,7 +2,7 @@ VERSION = 3
+ PATCHLEVEL = 14
+ SUBLEVEL = 5
+ EXTRAVERSION =
+-NAME = Remembering Coco
++NAME = Shuffling Zombie Juror
+ 
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.10-11.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.10-11.xz
new file mode 100644
index 0000000..00f9f15
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.10-11.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.11-12.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.11-12.xz
new file mode 100644
index 0000000..c020496
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.11-12.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.12-13.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.12-13.xz
new file mode 100644
index 0000000..20391ec
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.12-13.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.2-3.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.2-3.xz
new file mode 100644
index 0000000..32b4b26
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.2-3.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.3-4.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.3-4.xz
new file mode 100644
index 0000000..bde34a3
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.3-4.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.4-5.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.4-5.xz
new file mode 100644
index 0000000..9d699ec
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.4-5.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.5-6.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.5-6.xz
new file mode 100644
index 0000000..3926b84
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.5-6.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.6-7.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.6-7.xz
new file mode 100644
index 0000000..11a977b
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.6-7.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.7-8.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.7-8.xz
new file mode 100644
index 0000000..a3194d0
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.7-8.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.8-9.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.8-9.xz
new file mode 100644
index 0000000..99086b8
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.8-9.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.9-10.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.9-10.xz
new file mode 100644
index 0000000..e60dfa1
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.9-10.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
index 9b951bf..c81d176 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
@@ -1,6 +1,18 @@
 # keep in sync with stable
 patch-3.14.1.xz
 patch-3.14.1-2.xz
+patch-3.14.2-3.xz
+patch-3.14.3-4.xz
+patch-3.14.4-5.xz
+fix_name.diff
+patch-3.14.5-6.xz
+patch-3.14.6-7.xz
+patch-3.14.7-8.xz
+patch-3.14.8-9.xz
+patch-3.14.9-10.xz
+patch-3.14.10-11.xz
+patch-3.14.11-12.xz
+patch-3.14.12-13.xz
 
 # add full board feature support
 fix_new_display_number.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
index 1fcba97..7bc62a0 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.14/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 14
- SUBLEVEL = 2
+ SUBLEVEL = 13
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-master
  NAME = Shuffling Zombie Juror
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index cb62aa3..b01b1f3 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 2 (default)
+	\item \curKernelRev{}, stable patch level 13 (default)
 	\item 3.13 *), stable patch level 11
 	\item 3.12, stable patch level 24
 	\item 3.11 *), stable patch level 10 **)
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 00d1f7e..b621680 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -44,7 +44,7 @@ Base System
 [x] qml demo is a release
     [x] rule file uses the release
 [x] bootloader is a release
-[ ] kernel-3.14.2 is a release
+[ ] kernel-3.14.13 is a release
 [ ] kernel-3.13.11 is a release
 [ ] kernel-3.12.24 is a release
 [ ] kernel-3.11.10 is a release