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

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

10 files changed, 10 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 6f412d9..2710c2b 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -2,6 +2,8 @@
 
 	* Kernel 3.12:
 		- keep in sync with stable release .31
+	* Kernel 3.14:
+		- keep in sync with stable release .23
 
 2014-09-29	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
index 8522f42..98a35da 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.19-ptx-master Kernel Configuration
+# Linux/arm 3.14.23-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.19-20.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.19-20.xz
new file mode 100644
index 0000000..b56392b
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.19-20.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.20-21.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.20-21.xz
new file mode 100644
index 0000000..56cfaa3
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.20-21.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.21-22.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.21-22.xz
new file mode 100644
index 0000000..9af468c
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.21-22.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.22-23.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.22-23.xz
new file mode 100644
index 0000000..a42d8a2
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.22-23.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
index ec28db6..ba5e2ac 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
@@ -19,6 +19,10 @@ patch-3.14.15-16.xz
 patch-3.14.16-17.xz
 patch-3.14.17-18.xz
 patch-3.14.18-19.xz
+patch-3.14.19-20.xz
+patch-3.14.20-21.xz
+patch-3.14.21-22.xz
+patch-3.14.22-23.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 eedbe20..56875b9 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 = 19
+ SUBLEVEL = 23
 -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 4eee8f7..33aeaba 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -35,7 +35,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 \begin{itemize}
 	\item \curKernelRev{}, stable patch level 3 (default)
 	\item 3.15, stable patch level 7
-	\item 3.14, stable patch level 19
+	\item 3.14, stable patch level 23
 	\item 3.13 *), stable patch level 11
 	\item 3.12, stable patch level 31
 	\item 3.11 *), stable patch level 10 **)
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 3baf553..902abc4 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -46,7 +46,7 @@ Base System
 [x] bootloader is a release
 [ ] kernel-3.16.3 is a release
 [ ] kernel-3.15.7 is a release
-[ ] kernel-3.14.19 is a release
+[ ] kernel-3.14.23 is a release
 [ ] kernel-3.13.11 is a release
 [ ] kernel-3.12.31 is a release
 [ ] kernel-3.11.10 is a release