Kernel-3.1: Keep in sync with stable release 3.1.1

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

7 files changed, 7 insertions, 55 deletions

diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index 4deb19a..95d9c05 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -3,6 +3,8 @@
 	* Platform: Back to development
 	* Kernel 3.0:
 		- keep in sync with stable release .9
+	* Kernel 3.1:
+		- keep in sync with stable release .1
 
 2011-11-07	Juergen Beisert <jbe@pengutronix.de>
 
diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
index f0bac52..59ac6a5 100644
--- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
+++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.0-ptx-experimental Kernel Configuration
+# Linux/arm 3.1.1-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.diff
deleted file mode 100644
index d0e97ff..0000000
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/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.1/drivers/mtd/nand/nand_base.c
-===================================================================
---- linux-3.1.orig/drivers/mtd/nand/nand_base.c
-+++ linux-3.1/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.1/patch-3.1.1.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.1.bz2
new file mode 100644
index 0000000..9fb453e
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.1.bz2
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
index c2c0077..94dd71a 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
@@ -1,7 +1,5 @@
 # keep in sync with stable releases
-
-# 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.1.1.bz2
 
 # some fixes, occured on LKML/ALKML
 PATCH_2_3_rtc-s3c_Disable_alarm_entries_that_are_not_chosen.diff
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
index 5215836..6098c45 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
@@ -9,9 +9,9 @@ Index: linux-3.1/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 1
- SUBLEVEL = 0
+ SUBLEVEL = 1
 -EXTRAVERSION =
-+EXTRAVERSION = -ptx-experimental
++EXTRAVERSION = -ptx-master
  NAME = "Divemaster Edition"
  
  # *DOCUMENTATION*
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 1ca0511..961adc2 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -32,7 +32,7 @@ they are also available. Here is a list of currently available Linux kernel
 releases in the \ptxdistBSPName{}:
 
 \begin{itemize}
-	\item 3.1, (experimental)
+	\item 3.1, stable patch level 1 (experimental)
 	\item \curKernelRev{}, stable patch level 9 (default)
 	\item 2.6.39, stable patch level 4
 \end{itemize}