diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 05:39:26 +0100 |
---|---|---|
committer | Juergen Borleis <jbe@pengutronix.de> | 2015-01-31 07:49:42 +0100 |
commit | c2847adf094be08fee434ef29a9c530243e37280 (patch) | |
tree | 4cee71ded6f6d47ca6dd79f2e1a2a4764dbe0d41 | |
parent | e814557d5720118f854025d7b4ed1cc84fc5678c (diff) | |
download | OSELAS.BSP-Pengutronix-Mini2440-c2847adf094be08fee434ef29a9c530243e37280.tar.gz OSELAS.BSP-Pengutronix-Mini2440-c2847adf094be08fee434ef29a9c530243e37280.tar.xz |
Kernel-3.14: keep in sync with stable release .31
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r-- | configs/platform-friendlyarm-mini2440/Changelog | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/kernelconfig-3.14 | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.29-30.xz | bin | 0 -> 36196 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.30-31.xz | bin | 0 -> 43436 bytes | |||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.14/series | 2 | ||||
-rw-r--r-- | configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff | 2 | ||||
-rw-r--r-- | documentation/plain_sources/special_notes.tex | 2 | ||||
-rw-r--r-- | protocol/acceptance-test.txt | 2 |
8 files changed, 8 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index 335c898..e935925 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -4,6 +4,8 @@ - adapt the local udev rule to the curent PTXdist version * Kernel 3.12: - keep in sync with stable release .37 + * Kernel 3.14: + - keep in sync with stable release .31 2015-01-26 Juergen Borleis <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 index f339dbc..94457f1 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.29-ptx-master Kernel Configuration +# Linux/arm 3.14.31-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.29-30.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.29-30.xz Binary files differnew file mode 100644 index 0000000..49511b8 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.29-30.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.30-31.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.30-31.xz Binary files differnew file mode 100644 index 0000000..f3a0a2c --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.30-31.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series index 5565712..b3f4938 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series @@ -29,6 +29,8 @@ patch-3.14.25-26.xz patch-3.14.26-27.xz patch-3.14.27-28.xz patch-3.14.28-29.xz +patch-3.14.29-30.xz +patch-3.14.30-31.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 02c8690..6005065 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 = 29 + SUBLEVEL = 31 -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 64151bc..7477d22 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 3.16 *), stable patch level 7 \item 3.15 *), stable patch level 7 - \item 3.14, stable patch level 29 + \item 3.14, stable patch level 31 \item 3.13 *), stable patch level 11 \item 3.12, stable patch level 37 \item 3.11 *), stable patch level 10 **) diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 6e5e826..ab44cbd 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.7 is a release [ ] kernel-3.15.7 is a release -[ ] kernel-3.14.29 is a release +[ ] kernel-3.14.31 is a release [ ] kernel-3.13.11 is a release [ ] kernel-3.12.37 is a release [ ] kernel-3.11.10 is a release |