Kernel-3.0: Keep in sync with stable release 3.0.37

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

14 files changed, 20 insertions, 61 deletions

diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index cd1baa1..49c7d63 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -1,3 +1,8 @@
+2012-07-17	Juergen Beisert <jbe@pengutronix.de>
+
+	* Kernel 3.0:
+		- keep in sync with stable release .37
+
 2012-05-25	Juergen Beisert <jbe@pengutronix.de>
 
 	* Kernel 3.0:
diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
index 492e678..c68bf11 100644
--- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
+++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.32-ptx-master Kernel Configuration
+# Linux/arm 3.0.37-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/Move_compile_for_S3C64XX_cpufreq_to_drivers_cpufreq.patch b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/Move_compile_for_S3C64XX_cpufreq_to_drivers_cpufreq.patch
index 336e501..b4637b2 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/Move_compile_for_S3C64XX_cpufreq_to_drivers_cpufreq.patch
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/Move_compile_for_S3C64XX_cpufreq_to_drivers_cpufreq.patch
@@ -20,7 +20,7 @@ Index: linux-3.0/arch/arm/Kconfig
 ===================================================================
 --- linux-3.0.orig/arch/arm/Kconfig
 +++ linux-3.0/arch/arm/Kconfig
-@@ -1875,10 +1875,6 @@ config CPU_FREQ_PXA
+@@ -1901,10 +1901,6 @@ config CPU_FREQ_PXA
  	default y
  	select CPU_FREQ_DEFAULT_GOV_USERSPACE
  
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff
deleted file mode 100644
index 57acd10..0000000
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-From: "THOMSON, Adam (Adam)" <adam.thomson@alcatel-lucent.com>
-Subject: [PATCH] nand: nand_base: Always initialise oob_poi before writing OOB data
-
-In nand_do_write_ops() code it is possible for a caller to provide
-ops.oobbuf populated and ops.mode == MTD_OOB_AUTO, which currently
-means that the chip->oob_poi buffer isn't initialised to all 0xFF.
-The nand_fill_oob() method then carries out the task of copying
-the provided OOB data to oob_poi, but with MTD_OOB_AUTO it skips
-areas marked as unavailable by the layout struct, including the
-bad block marker bytes.
-
-An example of this causing issues is when the last OOB data read
-was from the start of a bad block where the markers are not 0xFF,
-and the caller wishes to write new OOB data at the beginning of
-another block. In this scenario the caller would provide OOB data,
-but nand_fill_oob() would skip the bad block marker bytes in
-oob_poi before copying the OOB data provided by the caller.
-This means that when the OOB data is written back to NAND,
-the block is inadvertently marked as bad without the caller knowing.
-This has been witnessed when using YAFFS2 where tags are stored
-in the OOB.
-
-This patch changes the code so that oob_poi is always initialised
-to 0xFF to make sure no left over data is inadvertently written
-back to OOB data.
-
-Signed-off-by: Adam Thomson <adam.thomson@alcatel-lucent.com>
----
- drivers/mtd/nand/nand_base.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: linux-3.0/drivers/mtd/nand/nand_base.c
-===================================================================
---- linux-3.0.orig/drivers/mtd/nand/nand_base.c
-+++ linux-3.0/drivers/mtd/nand/nand_base.c
-@@ -2201,9 +2201,9 @@ static int nand_do_write_ops(struct mtd_
- 	    (chip->pagebuf << chip->page_shift) < (to + ops->len))
- 		chip->pagebuf = -1;
- 
--	/* If we're not given explicit OOB data, let it be 0xFF */
--	if (likely(!oob))
--		memset(chip->oob_poi, 0xff, mtd->oobsize);
-+	/* Initialise to all 0xFF, to avoid the possibility of
-+	   left over OOB data from a previous OOB read. */
-+	memset(chip->oob_poi, 0xff, mtd->oobsize);
- 
- 	/* Don't allow multipage oob writes with offset */
- 	if (oob && ops->ooboffs && (ops->ooboffs + ops->ooblen > oobmaxlen))
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.32-33.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.32-33.bz2
new file mode 100644
index 0000000..6ee2613
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.32-33.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.33-34.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.33-34.bz2
new file mode 100644
index 0000000..bacd661
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.33-34.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.34-35.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.34-35.bz2
new file mode 100644
index 0000000..b26f13b
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.34-35.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.35-36.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.35-36.bz2
new file mode 100644
index 0000000..0160fbb
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.35-36.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.36-37.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.36-37.bz2
new file mode 100644
index 0000000..1721ad4
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.36-37.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/poison_initmem_when_it_is_freed.patch b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/poison_initmem_when_it_is_freed.patch
index ba2a031..08241eb 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/poison_initmem_when_it_is_freed.patch
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/poison_initmem_when_it_is_freed.patch
@@ -42,7 +42,7 @@ Index: linux-3.0/arch/arm/mm/init.c
  		__free_page(page);
  		pages++;
  	}
-@@ -532,7 +541,7 @@ static void __init free_highpages(void)
+@@ -539,7 +548,7 @@ static void __init free_highpages(void)
  				res_end = end;
  			if (res_start != start)
  				totalhigh_pages += free_area(start, res_start,
@@ -51,7 +51,7 @@ Index: linux-3.0/arch/arm/mm/init.c
  			start = res_end;
  			if (start == end)
  				break;
-@@ -540,7 +549,7 @@ static void __init free_highpages(void)
+@@ -547,7 +556,7 @@ static void __init free_highpages(void)
  
  		/* And now free anything which remains */
  		if (start < end)
@@ -60,7 +60,7 @@ Index: linux-3.0/arch/arm/mm/init.c
  	}
  	totalram_pages += totalhigh_pages;
  #endif
-@@ -572,7 +581,8 @@ void __init mem_init(void)
+@@ -579,7 +588,8 @@ void __init mem_init(void)
  #ifdef CONFIG_SA1111
  	/* now that our DMA memory is actually so designated, we can free it */
  	totalram_pages += free_area(PHYS_PFN_OFFSET,
@@ -70,7 +70,7 @@ Index: linux-3.0/arch/arm/mm/init.c
  #endif
  
  	free_highpages();
-@@ -706,13 +716,13 @@ void free_initmem(void)
+@@ -713,13 +723,13 @@ void free_initmem(void)
  
  	totalram_pages += free_area(__phys_to_pfn(__pa(&__tcm_start)),
  				    __phys_to_pfn(__pa(&__tcm_end)),
@@ -86,7 +86,7 @@ Index: linux-3.0/arch/arm/mm/init.c
  }
  
  #ifdef CONFIG_BLK_DEV_INITRD
-@@ -724,7 +734,7 @@ void free_initrd_mem(unsigned long start
+@@ -731,7 +741,7 @@ void free_initrd_mem(unsigned long start
  	if (!keep_initrd)
  		totalram_pages += free_area(__phys_to_pfn(__pa(start)),
  					    __phys_to_pfn(__pa(end)),
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
index 2365347..a0496ca 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
@@ -31,9 +31,11 @@ patch-3.0.28-29.bz2
 patch-3.0.29-30.bz2
 patch-3.0.30-31.bz2
 patch-3.0.31-32.bz2
-
-# this patch was intended for YAFFS users, but also JFFS2 uses the OOB area
-PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff
+patch-3.0.32-33.bz2
+patch-3.0.33-34.bz2
+patch-3.0.34-35.bz2
+patch-3.0.35-36.bz2
+patch-3.0.36-37.bz2
 
 # some fixes, occured on LKML/ALKML
 PATCH_1_3_rtc-s3c_Correct_debug_messages.diff
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff
index 815cce8..9d6d06f 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.0/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 0
- SUBLEVEL = 32
+ SUBLEVEL = 37
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-master
  NAME = Sneaky Weasel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index edb9110..dc8e1e3 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -33,7 +33,7 @@ releases in the \ptxdistBSPName{}:
 
 \begin{itemize}
 	\item \curKernelRev{}, stable patch level 10 (defaultl)
-	\item 3.0, stable patch level 32
+	\item 3.0, stable patch level 37
 	\item 2.6.39, stable patch level 4
 \end{itemize}
 
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index cbd856f..7c3754d 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -27,7 +27,7 @@ Base System
 -----------
 
 [ ] kernel-3.1.10 is a release
-[ ] kernel-3.0.32 is a release
+[ ] kernel-3.0.37 is a release
 [x] kernel-2.6.39.4 is a release
 [x] u-boot-1.1.6 is a release