r3543 - trunk/kernel/source/linux-2.6-2.6.12/debian

[Andres Salomon]

Author: dilinger
Date: 2005-07-16 07:35:52 +0000 (Sat, 16 Jul 2005)
New Revision: 3543

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches
   trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
Log:
list some dropped patches in changelog, and reasons for their dropping


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches	2005-07-16 07:28:22 UTC (rev 3542)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches	2005-07-16 07:35:52 UTC (rev 3543)
@@ -92,15 +92,6 @@
 	Two hunks failed, manually corrected.
 net-bluetooth-signdness-fix.patch
 	ACCEPTED.
-patch-2.6.11.10.patch
-patch-2.6.11.11.patch
-patch-2.6.11.12.patch
-patch-2.6.11.5.patch
-patch-2.6.11.6.patch
-patch-2.6.11.7.patch
-patch-2.6.11.8.patch
-patch-2.6.11.9.patch
-	All those are presumably backports, so not required.
 drivers-media-video-mt352-update.patch
 docbook-move-kernel-doc-comment-next-to-function.patch
 arch-ppc64-hugepage-aio-panic.patch
@@ -119,8 +110,6 @@
 	ACCEPTED.
 powerpc-pmac-cache-power34-fix.patch
 	NOT ACCEPTED | INCLUDED.
-powerpc-ppc64-ibmvscsi.patch
-	NOT ACCEPTED | REDIFFED | INCLUDED.
 powerpc-prep-motorola-irq-fix.patch
 	ACCEPTED.
 powerpc-serial.patch

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-16 07:28:22 UTC (rev 3542)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-16 07:35:52 UTC (rev 3543)
@@ -12,6 +12,11 @@
     - fixes + arch updates..
     - readdition of tg3 driver, as firmware license has been fixed
 
+  * Dropped the following patches:
+    - patch-2.6.11.*.patch (merged upstream)
+    - powerpc-ppc64-ibmvscsi.patch (Christoph didn't like it, and it failed
+      to build anyways) (Sven Luther)
+
   * Premiere of the common-source kernel package
     (Jurij Smakov, Andres Salomon)
     - build all architectures out of kernel source package
@@ -60,9 +65,6 @@
     kernel version. kernel-package will be teached to make use of this, but it
     needs some cleanup and tidying yet. (Sven Luther)
 
-  * Removed the ibmvscsi patch, as Christoph doesn't like it, and it failed to
-    build anyway. (Sven Luther)
-
   * Disabled software suspend on powerpc-smp, as the smp code in software
     suspend is amd64/i386 only. (Sven Luther)