r1264 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-08-21 16:13:59 -0600 (Sat, 21 Aug 2004)
New Revision: 1264

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/068_ehci_oops.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/069_parisc_comment.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/control
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4
Log:
068_ehci_oops.diff, 069_parisc_comment.diff

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-19 17:10:48 UTC (rev 1263)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-21 22:13:59 UTC (rev 1264)
@@ -1,13 +1,19 @@
 kernel-source-2.4.27 (2.4.27-4) UNRELEASED; urgency=low
 
   * 065_copy_user_parens.diff: This patch is cset 1.1447.4.7 from linux-2.4,
-    allowing us to build using binutils 2.15.
+    allowing us to build arch/sparc/lib/copy_user.S using binutils 2.15.
   * 066_dep_fw_loader.diff: Prevent TIGON3 and PCMCIA_ATMEL from being
-    enabled if FW_LOADER is not selected.
+    enabled if FW_LOADER is not selected. (Closes: #266397)
   * 067_tg3_ampersand.diff: Remove spurious & to tp->pdev, which caused a
     warning in pci_name. May or may not have affected firmware loading.
+  * 068_ehci_oops.diff: probable fix for some ehci-hcd hang issues. cset
+    1.1483 from linux-2.4. (Closes: #266621)
+  * 069_parisc_comment.diff: Fix an unterminated comment in
+    include/asm-parisc/som.h. (Closes: #266594)
+  * Remove a bogus Conflicts on 2.4.27-4, due to copy and waste from
+    kernel-source-2.4.26 where this was necessary.
 
- -- Joshua Kwan <joshk@triplehelix.org>  Wed, 18 Aug 2004 23:04:18 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Thu, 19 Aug 2004 13:55:50 -0700
 
 kernel-source-2.4.27 (2.4.27-3) unstable; urgency=high
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/control	2004-08-19 17:10:48 UTC (rev 1263)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/control	2004-08-21 22:13:59 UTC (rev 1264)
@@ -61,7 +61,6 @@
 Section: devel
 Priority: optional
 Depends: kernel-patch-debian-2.4.27 (= ${Source-Version}), ${kt-depends}
-Conflicts: kernel-source-2.4.27 (= 2.4.27-4)
 Provides: ${kt-provides}
 Description: Linux kernel tree for building prepackaged Debian kernel images
  This meta package is used as a build-time dependency of prepackaged

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/068_ehci_oops.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/068_ehci_oops.diff	2004-08-19 17:10:48 UTC (rev 1263)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/068_ehci_oops.diff	2004-08-21 22:13:59 UTC (rev 1264)
@@ -0,0 +1,41 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet@1.1483
+#   2004/08/14 13:50:37-03:00 zaitcev@redhat.com 
+#   [PATCH] David Brownell: Fix uhci-hcd oops
+#   
+#   The attached ought to fix Nick up (no way to tell about Kai because his
+#   report had no data). It consists of two things. First, it fixes the
+#   oops in the scan_async. Second, it prevents the oops from happening by
+#   ignoring the handoff failure (as the old code did, in effect). Either
+#   one should be sufficient, but this is why I use both. The if around
+#   scan_async is the right fix, so it's there on merit. However, it yields
+#   a non-working EHCI if your BIOS is buggy.
+# 
+# drivers/usb/host/ehci-hcd.c
+#   2004/07/30 20:21:12-03:00 zaitcev@redhat.com +4 -2
+#   David Brownell: Fix uhci-hcd oops
+# 
+diff -Nru a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
+--- a/drivers/usb/host/ehci-hcd.c	2004-08-19 09:34:20 -07:00
++++ b/drivers/usb/host/ehci-hcd.c	2004-08-19 09:34:20 -07:00
+@@ -303,7 +303,8 @@
+ 		if (cap & (1 << 16)) {
+ 			ehci_err (ehci, "BIOS handoff failed (%d, %04x)\n",
+ 				where, cap);
+-			return 1;
++			pci_write_config_dword (ehci->hcd.pdev, where, 0);
++			return 0;
+ 		} 
+ 		ehci_dbg (ehci, "BIOS handoff succeeded\n");
+ 	}
+@@ -547,7 +548,8 @@
+ 
+ 	/* root hub is shut down separately (first, when possible) */
+ 	spin_lock_irq (&ehci->lock);
+-	ehci_work (ehci, NULL);
++	if (ehci->async)
++		ehci_work (ehci, NULL);
+ 	spin_unlock_irq (&ehci->lock);
+ 	ehci_mem_cleanup (ehci);
+ 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/069_parisc_comment.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/069_parisc_comment.diff	2004-08-19 17:10:48 UTC (rev 1263)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/069_parisc_comment.diff	2004-08-21 22:13:59 UTC (rev 1264)
@@ -0,0 +1,8 @@
+--- a/include/asm-parisc/som.h	2004-08-19 13:54:14.000000000 -0700
++++ b/include/asm-parisc/som.h	2004-08-19 13:54:46.000000000 -0700
+@@ -5,4 +5,4 @@
+ #include <linux/som.h>
+ 
+ 
+-#endif /* _ASM_PARISC_SOM_H
++#endif /* _ASM_PARISC_SOM_H */

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4	2004-08-19 17:10:48 UTC (rev 1263)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-4	2004-08-21 22:13:59 UTC (rev 1264)
@@ -1,3 +1,5 @@
 + 065_copy_user_parens.diff
 + 066_dep_fw_loader.diff
 + 067_tg3_ampersand.diff
++ 068_ehci_oops.diff
++ 069_parisc_comment.diff