r1967 - in trunk/kernel/source: kernel-source-2.6.8-2.6.8/debian/patches kernel-source-2.6.9-2.6.9/debian kernel-source-2.6.9-2.6.9/debian/patches kernel-source-2.6.9-2.6.9/debian/patches/series

[Dann Frazier]

Author: dannf
Date: 2004-12-03 09:41:59 -0700 (Fri, 03 Dec 2004)
New Revision: 1967

Added:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-firmware-pcdp-register.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
Log:
update upstream status & merge the pcdp fix into the 2.6.9 tree


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch	2004-12-03 14:53:19 UTC (rev 1966)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch	2004-12-03 16:41:59 UTC (rev 1967)
@@ -1,6 +1,6 @@
 # origin: Bjorn Helgaas (<bjorn.helgaas@hp.com>)
 # cset: n/a
-# inclusion: Not yet submitted
+# inclusion: Has been fixed in a code restructuring that will appear in 2.6.10
 # revision-date: 2004-12-03
 
 ===== drivers/firmware/pcdp.c 1.6 vs edited =====

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-12-03 14:53:19 UTC (rev 1966)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-12-03 16:41:59 UTC (rev 1967)
@@ -18,8 +18,11 @@
   * [SECURITY] Fix problems in VM_IO refcount; CAN not yet assigned
     (Fabio M. Di Nitto).
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sat, 27 Nov 2004 16:07:47 -0800
+  * Delay registration of HCDP described UARTs, fixing the PDH console
+    on HP rx1600s (merged patch from k-s 2.6.8) (dann frazier).
 
+ -- dann frazier <dannf@debian.org>  Fri, 03 Dec 2004 09:26:52 -0700
+
 kernel-source-2.6.9 (2.6.9-3) unstable; urgency=low
 
   * Include dm_io-ENOMEM-goof patch that was included in final 2.6.8-8

Copied: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-firmware-pcdp-register.dpatch (from rev 1966, trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch)
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-firmware-pcdp-register.dpatch	2004-12-03 14:53:19 UTC (rev 1966)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-firmware-pcdp-register.dpatch	2004-12-03 16:41:59 UTC (rev 1967)
@@ -0,0 +1,18 @@
+# origin: Bjorn Helgaas (<bjorn.helgaas@hp.com>)
+# cset: n/a
+# inclusion: Has been fixed in a code restructuring that will appear in 2.6.10
+# revision-date: 2004-12-03
+
+===== drivers/firmware/pcdp.c 1.6 vs edited =====
+--- 1.6/drivers/firmware/pcdp.c	2004-07-28 22:58:54 -06:00
++++ edited/drivers/firmware/pcdp.c	2004-12-02 11:09:43 -07:00
+@@ -97,9 +97,6 @@ setup_serial_console(int rev, struct pcd
+ 	port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
+ 
+ 	if (uart_irq_supported(rev, uart)) {
+-		port.irq = acpi_register_gsi(uart->gsi,
+-			uart_active_high_low(rev, uart),
+-			uart_edge_level(rev, uart));
+ 		port.flags |= UPF_AUTO_IRQ;  /* some FW reported wrong GSI */
+ 		if (uart_pci(rev, uart))
+ 			port.flags |= UPF_SHARE_IRQ;

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4	2004-12-03 14:53:19 UTC (rev 1966)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4	2004-12-03 16:41:59 UTC (rev 1967)
@@ -3,3 +3,4 @@
 + selinux-seqpacket-fix.dpatch
 + mark-vmio.dpatch
 + unix-serialize-dgram.dpatch
++ drivers-firmware-pcdp-register.dpatch