Kernel-3.15: keep in sync with stable release .7

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

7 files changed, 8 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 200ff56..2170e46 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -8,6 +8,8 @@
 		- keep in sync with stable release .28
 	* Kernel 3.14:
 		- keep in sync with stable release .19
+	* Kernel 3.15:
+		- keep in sync with stabel release .7
 
 2014-07-20	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.15 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.15
index 64bec2c..ebe345c 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.15
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.15
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.15.6-ptx-master Kernel Configuration
+# Linux/arm 3.15.7-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -246,6 +246,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 # CONFIG_FREEZER is not set
 
 #
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.15/patch-3.15.6-7.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/patch-3.15.6-7.xz
new file mode 100644
index 0000000..f778109
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/patch-3.15.6-7.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.15/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/series
index 3ca2ef6..91aa655 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.15/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/series
@@ -5,6 +5,7 @@ patch-3.15.2-3.xz
 patch-3.15.3-4.xz
 patch-3.15.4-5.xz
 patch-3.15.5-6.xz
+patch-3.15.6-7.xz
 
 # add full board feature support
 fix_new_display_number.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.15/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/set-marker.diff
index 9673af8..5245aae 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.15/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.15/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.15/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 15
- SUBLEVEL = 6
+ SUBLEVEL = 7
 -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 4a32394..501de65 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 6 (default)
+	\item \curKernelRev{}, stable patch level 7 (default)
 	\item 3.14, stable patch level 19
 	\item 3.13 *), stable patch level 11
 	\item 3.12, stable patch level 28
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index a34a7e8..6dfdf1f 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.15.6 is a release
+[ ] kernel-3.15.7 is a release
 [ ] kernel-3.14.19 is a release
 [ ] kernel-3.13.11 is a release
 [ ] kernel-3.12.28 is a release