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

[Andres Salomon]

Author: dilinger
Date: 2005-07-16 07:56:09 +0000 (Sat, 16 Jul 2005)
New Revision: 3544

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:
more merged patches listed in changelog


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:35:52 UTC (rev 3543)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches	2005-07-16 07:56:09 UTC (rev 3544)
@@ -13,10 +13,6 @@
 
 These are already processed:
 ----------------------------
-alpha-read-trylock.patch
-	INCONCLUSIVE. Patch #define'd _raw_read_trylock, which is now 
-	defined as a function.
-	Not required, confirmed by Christoph Hellwig.
 powerpc-ppc64-biarch-override.patch
 	ACCEPTED in akpm tree, INCLUDED as a backport.
 ia64-generic-nosmp.patch
@@ -116,22 +112,12 @@
 	NOT ACCEPTED | REDIFFED | INCLUDED.
 powerpc-therm-adt746x-new-i2c-fix.patch
 	ACCEPTED.
-sparc-sunsab-serial-lockup.patch
-	SUPERSEDED by sunsab-uart-update-timeout.patch
-sparc64-compat-nanoseconds.patch
-	ACCEPTED.
 sparc64-hme-lockup.patch
 	NOT ACCEPTED | REDIFFED | INCLUDED.
-sparc64-rtc-mostek.patch
-	ACCEPTED.
 sparc64-sb1500-clock-2.6.patch
 	ACCEPTED.
 sparc64-sigpoll-2.6.11.patch
 	ACCEPTED.
-sparc64-sunsu-init-2.6.11.patch
-	ACCEPTED.
-sunsab-uart-update-timeout.patch
-	ACCEPTED.
 tty-locking-fixes9.patch
 	NOT ACCEPTED | INCLUDED.
 x86-i486_emu.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:35:52 UTC (rev 3543)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-16 07:56:09 UTC (rev 3544)
@@ -13,9 +13,14 @@
     - readdition of tg3 driver, as firmware license has been fixed
 
   * Dropped the following patches:
-    - patch-2.6.11.*.patch (merged upstream)
+    - patch-2.6.11.*.patch (merged)
     - powerpc-ppc64-ibmvscsi.patch (Christoph didn't like it, and it failed
       to build anyways) (Sven Luther)
+    - sparc64-rtc-mostek.patch (merged)
+    - sparc64-compat-nanoseconds.patch (merged) 
+    - sparc64-sunsu-init-2.6.11.patch (merged)
+    - sunsab-uart-update-timeout.patch (merged)
+    - alpha-read-trylock.patch (different version got merged)
 
   * Premiere of the common-source kernel package
     (Jurij Smakov, Andres Salomon)