r3548 - in trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian: . series

[Andres Salomon]

Author: dilinger
Date: 2005-07-16 08:44:59 +0000 (Sat, 16 Jul 2005)
New Revision: 3548

Added:
   trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.patch
Removed:
   trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.dpatch
Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/series/2.6.12-1
Log:
sparc64-hme-lockup.patch was missing, readd (and fix name)


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/series/2.6.12-1
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/series/2.6.12-1	2005-07-16 08:43:37 UTC (rev 3547)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/series/2.6.12-1	2005-07-16 08:44:59 UTC (rev 3548)
@@ -24,3 +24,4 @@
 + patch-2.6.12.2
 + powerpc-mkvmlinuz-support.patch
 + patch-2.6.12.3
++ sparc64-hme-lockup.patch

Deleted: trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.dpatch
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.dpatch	2005-07-16 08:43:37 UTC (rev 3547)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.dpatch	2005-07-16 08:44:59 UTC (rev 3548)
@@ -1,16 +0,0 @@
-# origin: Debian (bcollins)
-# cset: n/a
-# inclusion: not suitable for upstream
-# revision date: 2004-10-08
-
-diff -aurN a/drivers/net/sunhme.c b/drivers/net/sunhme.c
---- a/drivers/net/sunhme.c	2005-06-17 15:48:29.000000000 -0400
-+++ b/drivers/net/sunhme.c	2005-06-18 12:12:18.000000000 -0400
-@@ -1996,6 +1996,7 @@
- 	}
- 	hp->tx_old = elem;
- 	TXD((">"));
-+	udelay(1);
- 
- 	if (netif_queue_stopped(dev) &&
- 	    TX_BUFFS_AVAIL(hp) > (MAX_SKB_FRAGS + 1))

Copied: trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.patch (from rev 3542, trunk/kernel/source/linux-2.6-2.6.12/debian/patches-debian/sparc64-hme-lockup.dpatch)