r1469 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[maks-guest@haydn.debian.org]

Author: maks-guest
Date: 2004-08-29 04:02:35 -0600 (Sun, 29 Aug 2004)
New Revision: 1469

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/jfs-memory-leak.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sis900-add-phy.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
Log:
add an jfs memory leak fix and another si900 phy.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-29 09:43:07 UTC (rev 1468)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-29 10:02:35 UTC (rev 1469)
@@ -8,6 +8,10 @@
 
   * Revert changelog.dpatch that was silently added (Christoph Hellwig).
 
+  * JFS: fix memory leak. (Max Attems)
+
+  * Add sis900 phy. (Max Attems)
+
  -- 
 
 kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/jfs-memory-leak.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/jfs-memory-leak.dpatch	2004-08-29 09:43:07 UTC (rev 1468)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/jfs-memory-leak.dpatch	2004-08-29 10:02:35 UTC (rev 1469)
@@ -0,0 +1,22 @@
+#! /bin/sh -e  
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: fix memory leak in jfs
+## DP: Patch author: Dave Kleikamp <shaggy@austin.ibm.com>
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+diff -Nru a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
+--- a/fs/jfs/jfs_metapage.c	2004-08-29 02:47:38 -07:00
++++ b/fs/jfs/jfs_metapage.c	2004-08-29 02:47:38 -07:00
+@@ -557,6 +557,7 @@
+ 			if (page) {
+ 				block_invalidatepage(page, 0);
+ 				unlock_page(page);
++				page_cache_release(page);
+ 			}
+ 		}
+ 	}

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-29 09:43:07 UTC (rev 1468)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-29 10:02:35 UTC (rev 1469)
@@ -2,3 +2,5 @@
 + netstat-fix-output.dpatch
 + intel-cache-descriptors.dpatch
 - changelog.dpatch
++ jfs-memory-leak.dpatch
++ sis900-add-phy.dpatch

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sis900-add-phy.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sis900-add-phy.dpatch	2004-08-29 09:43:07 UTC (rev 1468)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sis900-add-phy.dpatch	2004-08-29 10:02:35 UTC (rev 1469)
@@ -0,0 +1,33 @@
+#! /bin/sh -e  
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: add sis900 phy
+## DP: Patch author: Laurent <laurent@gobio2.net>
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+#    product info: vendor 08:00:17, model 3 rev 0
+#   
+#   and after some search on the web, I found it's a NS DP83847 which is very
+#   similar.
+#   
+#   Signed-off-by: Andrew Morton <akpm@osdl.org>
+# 
+# drivers/net/sis900.c
+#   2004/08/25 03:15:20-04:00 akpm@osdl.org +1 -0
+#   Problem with SiS900 - Unknown PHY
+# 
+diff -Nru a/drivers/net/sis900.c b/drivers/net/sis900.c
+--- a/drivers/net/sis900.c	2004-08-29 02:46:36 -07:00
++++ b/drivers/net/sis900.c	2004-08-29 02:46:36 -07:00
+@@ -124,6 +124,7 @@
+ 	{ "AMD 79C901 HomePNA PHY",		0x0000, 0x6B90, HOME},
+ 	{ "ICS LAN PHY",			0x0015, 0xF440, LAN },
+ 	{ "NS 83851 PHY",			0x2000, 0x5C20, MIX },
++	{ "NS 83847 PHY",                       0x2000, 0x5C30, MIX },
+ 	{ "Realtek RTL8201 PHY",		0x0000, 0x8200, LAN },
+ 	{ "VIA 6103 PHY",			0x0101, 0x8f20, LAN },
+ 	{NULL,},