r2613 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches

[Sven Luther]

Author: luther
Date: 2005-03-05 11:07:31 +0100 (Sat, 05 Mar 2005)
New Revision: 2613

Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-initrd-memcpy.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
Log:
dropped another upstream patch, and marked another as droppable.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-05 10:01:53 UTC (rev 2612)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-05 10:07:31 UTC (rev 2613)
@@ -1,15 +1,16 @@
 # + modular-ide-pnp.dpatch			# OK, needs rediff
+# + drivers-net-tg3-readd.dpatch		# OK, needs rediff
+# + drivers-scsi_changer.dpatch			# OK, needs rediff
+# + x86-i486_emu.dpatch				# OK, needs rediff
+
 # + modular-ide.dpatch 				# FAILED
 # + drivers-net-8139too-locking.dpatch		# FAILED
-# + drivers-net-tg3-readd.dpatch		# OK, needs rediff
-# + drivers-scsi_changer.dpatch			# OK, needs rediff
 # + remove-references-to-removed-drivers.dpatch	# FAILED
-# + x86-i486_emu.dpatch				# OK, needs rediff
-# + sparc32-initrd-memcpy.dpatch		# FAILED
 # + drm-locking-fixes.dpatch			# FAILED
 # + ia64-generic-no-smp.dpatch			# FAILED
 # + ia64-generic-no-smp-1-to-2.dpatch		# FAILED
 # + 029-random_poolsize_overflow.dpatch		# FAILED
 # + 030-moxa_user_copy_checking.dpatch		# FAILED
 # + drivers-ide-__devinit.dpatch		# FAILED
-# + ipv4-fragment-queues-2.dpatch		# FAILED
+
+# + ipv4-fragment-queues-2.dpatch		# DROP, code seems to have dissapeared upstream ?

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-initrd-memcpy.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-initrd-memcpy.dpatch	2005-03-05 10:01:53 UTC (rev 2612)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-initrd-memcpy.dpatch	2005-03-05 10:07:31 UTC (rev 2613)
@@ -1,17 +0,0 @@
-# origin: Debian (jurij)
-# cset: n/a
-# inclusion: approved by davem (projected: 2.4.28)
-# revision date: 2004-11-15
-
---- build-sparc32.orig/include/asm-sparc/string.h	2004-08-14 01:36:11.000000000 -0400
-+++ build-sparc32/include/asm-sparc/string.h	2004-11-14 22:09:49.000000000 -0500
-@@ -40,6 +40,9 @@
- 
- 	if(n <= 32) {
- 		__builtin_memcpy(to, from, n);
-+	} else if (((unsigned int) to & 7) != 0) {
-+		/* Destination is not aligned on the double-word boundary */
-+		__memcpy(to, from, n);
- 	} else {
- 		switch(n) {
- 		case PAGE_SIZE: