[kernel] r8429 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/series

[Maximilian Attems]

Author: maks
Date: Fri Apr  6 21:56:53 2007
New Revision: 8429

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.6
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
add 2.6.20.6
aka eastern kick-off :)


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Apr  6 21:56:53 2007
@@ -231,6 +231,9 @@
     - DVB: isl6421: don't reference freed memory
     - V4L: radio: Fix error in Kbuild file
     - i2o: block IO errors on i2o disk
+  * Add stable release 2.6.20.6:
+    - CRYPTO api: Use the right value when advancing scatterwalk_copychunks
+    - uml: fix static linking for real
 
   [ Gordon Farquharson ]
   * Disable broken config options on ARM.
@@ -246,7 +249,7 @@
   * Allow '.' and '+' in the target dist field of the changelog. dpkg has
     supported this since 1.13.20, see #361171.
 
- -- maximilian attems <maks at debian.org>  Fri,  6 Apr 2007 21:17:20 +0200
+ -- maximilian attems <maks at debian.org>  Fri,  6 Apr 2007 23:55:24 +0200
 
 linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.6
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.6	Fri Apr  6 21:56:53 2007
@@ -0,0 +1,26 @@
+diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
+index a664231..0f76175 100644
+--- a/crypto/scatterwalk.c
++++ b/crypto/scatterwalk.c
+@@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
+ 		memcpy_dir(buf, vaddr, len_this_page, out);
+ 		scatterwalk_unmap(vaddr, out);
+ 
+-		scatterwalk_advance(walk, nbytes);
++		scatterwalk_advance(walk, len_this_page);
+ 
+ 		if (nbytes == len_this_page)
+ 			break;
+diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
+index b16222b..f5de80c 100644
+--- a/include/asm-um/common.lds.S
++++ b/include/asm-um/common.lds.S
+@@ -15,7 +15,7 @@
+   PROVIDE (_unprotected_end = .);
+ 
+   . = ALIGN(4096);
+-  .note : { *(note.*) }
++  .note : { *(.note.*) }
+   __start___ex_table = .;
+   __ex_table : { *(__ex_table) }
+   __stop___ex_table = .;

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Fri Apr  6 21:56:53 2007
@@ -41,3 +41,4 @@
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/2.6.20.4
 + bugfix/2.6.20.5
++ bugfix/2.6.20.6