r1543 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Fri, 03 Sep 2004 23:00:29 -0600
Author: joshk
Date: 2004-09-03 23:00:11 -0600 (Fri, 03 Sep 2004)
New Revision: 1543
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/042_toshiba_blacklist.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/044_ide_48bit_hpa.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/045_isdn_cleanups.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/046_mtd_config_dep.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/047_advansys_le32.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/048_aic_werror.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/049_ohci_urb_complete.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/050_export_proc.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/051_sparse_off_t.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/059_ea_acl.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/061_devmapper_1.00.19-2.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/062_ide_stroke_runtime.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/063_firmwareless_tg3.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff
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
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/073_tg3_hw_autoneg.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff
Log:
first round of patch annotations
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/031_dpti2o_alpha_fix.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted (not suitable?)
+# description: fix compile error on sparc64/alpha
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/scsi/dpt_i3o.c kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c
--- kernel-source-2.4.26/drivers/scsi/dpt_i2o.c 2003-06-14 00:51:36.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/scsi/dpt_i2o.c 2003-06-01 20:43:49.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: set ?time to 0 for cramfs
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.22-2.4.22.orig/fs/cramfs/inode.c kernel-source-2.4.22-2.4.22/fs/cramfs/inode.c
--- kernel-source-2.4.22-2.4.22.orig/fs/cramfs/inode.c 2002-08-03 10:39:45.000000000 +1000
+++ kernel-source-2.4.22-2.4.22/fs/cramfs/inode.c 2002-08-30 20:40:16.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #159772
+# cset: n/a
+# inclusion: not submitted
+# description: fix umsdos_solve_hlink oops in dir.c
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/fs/umsdos/dir.c kernel-source-2.4.26-1/fs/umsdos/dir.c
--- kernel-source-2.4.26/fs/umsdos/dir.c 2003-06-14 00:51:37.000000000 +1000
+++ kernel-source-2.4.26-1/fs/umsdos/dir.c 2003-06-01 20:43:54.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #193365
+# cset: n/a
+# inclusion: not submitted
+# description: use seq interface for /proc/modules to avoid truncation
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/fs/proc/proc_misc.c kernel-source-2.4.26-1/fs/proc/proc_misc.c
--- kernel-source-2.4.26/fs/proc/proc_misc.c 2003-11-29 05:26:21.000000000 +1100
+++ kernel-source-2.4.26-1/fs/proc/proc_misc.c 2003-11-29 20:53:47.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: make epatc8 a runtime option
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/block/paride/epat.c kernel-source-2.4.26-1/drivers/block/paride/epat.c
--- kernel-source-2.4.26/drivers/block/paride/epat.c 2002-11-29 10:53:12.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/block/paride/epat.c 2002-11-30 16:25:11.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: extern inline makes no sense
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h
--- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h 2002-08-03 10:39:44.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h 2002-03-06 19:49:48.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: AMD_PM768 is only relevant for x86_64 arch
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/char/Config.in kernel-source-2.4.26-1/drivers/char/Config.in
--- kernel-source-2.4.26/drivers/char/Config.in 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/char/Config.in 2004-02-22 20:28:14.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #187962
+# cset: n/a
+# inclusion: not submitted
+# description: cover up i810_dma problem, prevent oops
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/char/drm/i810_dma.c kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c
--- kernel-source-2.4.26/drivers/char/drm/i810_dma.c 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c 2004-02-22 20:28:16.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #178874
+# cset: n/a
+# inclusion: not submitted
+# description: duplicate detection fix for ibmtr
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c
--- kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c 2001-11-10 09:02:24.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c 2003-03-22 12:13:25.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #192259
+# cset: n/a
+# inclusion: not submitted
+# description: fix size of default_port to allow forced 10mbit operation
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/net/via-rhine.c kernel-source-2.4.26-1/drivers/net/via-rhine.c
--- kernel-source-2.4.26/drivers/net/via-rhine.c 2003-11-29 05:26:20.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/net/via-rhine.c 2003-11-29 20:53:36.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,7 +1,25 @@
-diff -urN kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c
---- kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c 2003-11-29 05:26:20.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c 2004-02-18 18:52:27.000000000 +1100
-@@ -3990,11 +3990,10 @@
+# origin: bk (linux-2.6)
+# cset: 1.1371.776.19 (linux-2.6)
+# inclusion: n/a (only in linux-2.6 bk)
+# description: fix SMP deadlock for aic7xxx
+# revision date: 2004-09-03
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/05/04 09:21:23-05:00 akpm@osdl.org
+# [PATCH] aic7xxx deadlock fix
+#
+# We cannot call del_timer_sync() from within that timer's handler function!
+#
+# drivers/scsi/aic7xxx/aic7xxx_osm.c
+# 2004/04/26 01:09:29-05:00 akpm@osdl.org +9 -3
+# aic7xxx deadlock fix
+#
+diff -Nru a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
+--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c 2004-09-03 20:40:42 -07:00
++++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c 2004-09-03 20:40:42 -07:00
+@@ -3973,11 +3973,10 @@
}
static void
@@ -14,7 +32,7 @@
targ = dev->target;
targ->devices[dev->lun] = NULL;
free(dev, M_DEVBUF);
-@@ -4004,6 +4003,13 @@
+@@ -3987,6 +3986,13 @@
ahc_linux_free_target(ahc, targ);
}
@@ -28,7 +46,7 @@
void
ahc_send_async(struct ahc_softc *ahc, char channel,
u_int target, u_int lun, ac_code code, void *arg)
-@@ -4703,7 +4709,7 @@
+@@ -4697,7 +4703,7 @@
ahc_linux_run_device_queue(ahc, dev);
if (TAILQ_EMPTY(&dev->busyq)
&& dev->active == 0)
@@ -37,4 +55,3 @@
ahc_unlock(ahc, &s);
}
-
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/042_toshiba_blacklist.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/042_toshiba_blacklist.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/042_toshiba_blacklist.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #222939
+# cset: n/a
+# inclusion: not submitted
+# description: XM-1702C doesn't work in DMA mode, blacklist it
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/ide/ide-dma.c kernel-source-2.4.26-1/drivers/ide/ide-dma.c
--- kernel-source-2.4.26/drivers/ide/ide-dma.c 2003-08-25 21:44:41.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/ide/ide-dma.c 2004-02-28 14:54:23.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/044_ide_48bit_hpa.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/044_ide_48bit_hpa.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/044_ide_48bit_hpa.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: allow 48-bit LBA host protected area
+# revision date: 2004-09-03
+
--- kernel-source-2.4.27-2.4.27/drivers/ide/ide-disk.c~ 2004-08-12 22:34:17.000000000 -0700
+++ kernel-source-2.4.27-2.4.27/drivers/ide/ide-disk.c 2004-08-12 22:35:46.000000000 -0700
@@ -69,6 +69,7 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/045_isdn_cleanups.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/045_isdn_cleanups.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/045_isdn_cleanups.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted (first hunk is unsuitable hack)
+# description: Fixed the use of return values from mem*_io
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/isdn/hisax/cert.c kernel-source-2.4.26-1/drivers/isdn/hisax/cert.c
--- kernel-source-2.4.26/drivers/isdn/hisax/cert.c 2001-12-22 04:41:54.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/isdn/hisax/cert.c 2003-07-18 21:22:56.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/046_mtd_config_dep.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/046_mtd_config_dep.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/046_mtd_config_dep.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert), #173045
+# cset: n/a
+# inclusion: not submitted
+# description: add MTD_CONCAT dep for MTD_SC520CDP
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/mtd/maps/Config.in kernel-source-2.4.26-1/drivers/mtd/maps/Config.in
--- kernel-source-2.4.26/drivers/mtd/maps/Config.in 2003-06-14 00:51:34.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/mtd/maps/Config.in 2003-06-01 20:43:47.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/047_advansys_le32.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/047_advansys_le32.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/047_advansys_le32.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #128080
+# cset: n/a
+# inclusion: not submitted
+# description: unbreak wide cards on big-endian archs
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/scsi/advansys.c kernel-source-2.4.26-1/drivers/scsi/advansys.c
--- kernel-source-2.4.26/drivers/scsi/advansys.c 2004-04-14 23:05:31.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/scsi/advansys.c 2004-04-17 14:23:54.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/048_aic_werror.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/048_aic_werror.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/048_aic_werror.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: disable -Werror
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/scsi/aic7xxx/Makefile kernel-source-2.4.26-1/drivers/scsi/aic7xxx/Makefile
--- kernel-source-2.4.26/drivers/scsi/aic7xxx/Makefile 2003-08-25 21:44:42.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/scsi/aic7xxx/Makefile 2003-09-06 07:10:34.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/049_ohci_urb_complete.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/049_ohci_urb_complete.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/049_ohci_urb_complete.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: Always call complete after unlinking a urb
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/usb/host/usb-ohci.c kernel-source-2.4.26-1/drivers/usb/host/usb-ohci.c
--- kernel-source-2.4.26/drivers/usb/host/usb-ohci.c 2004-04-14 23:05:33.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/usb/host/usb-ohci.c 2004-04-17 14:24:00.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/050_export_proc.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/050_export_proc.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/050_export_proc.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,6 +1,43 @@
-diff -urN kernel-source-2.4.26/fs/proc/root.c kernel-source-2.4.26-1/fs/proc/root.c
---- kernel-source-2.4.26/fs/proc/root.c 2002-08-03 10:39:45.000000000 +1000
-+++ kernel-source-2.4.26-1/fs/proc/root.c 2002-08-05 21:23:29.000000000 +1000
+# origin: bk
+# cset: 1.1136.66.1
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: export proc_get_inode to allow modular comx
+# revision date: 2004-09-03
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2003/11/15 11:29:46-02:00 xose@wanadoo.es
+# [PATCH] Export proc_get_inode
+#
+# Xose Vazquez Perez wrote:
+#
+# > depmod: *** Unresolved symbols in /lib/modules/2.4.23-pre5/kernel/drivers/net/wan/comx.o
+# > depmod: proc_get_inode
+#
+# This bug was fixed in aa since 2.4.19pre8aa2 !!
+# Maybe someone needs to do a sync between 2.4.24-pre1 against pac and aa patches.
+#
+# http://ftp.kernel.org/pub/linux/kernel/people/andrea/kernels/v2.4/2.4.23pre6aa3/00_comx-driver-compile-1
+#
+# 00_comx-driver-compile-1 first appeared in 2.4.19pre8aa2 - 258 bytes
+#
+# Export proc_get_inode for kernel/drivers/net/wan/comx.o so
+# it can link as a module, noticed by Eyal Lebedinsky.
+#
+# -thanks-
+# --
+# HTML mails are going to trash automagically
+#
+# [ Part 2: "Attached Text" ]
+#
+# fs/proc/root.c
+# 2002/05/04 10:45:30-03:00 xose@wanadoo.es +1 -0
+# Export proc_get_inode
+#
+diff -Nru a/fs/proc/root.c b/fs/proc/root.c
+--- a/fs/proc/root.c 2004-09-03 19:25:35 -07:00
++++ b/fs/proc/root.c 2004-09-03 19:25:35 -07:00
@@ -145,3 +145,4 @@
EXPORT_SYMBOL(proc_net);
EXPORT_SYMBOL(proc_bus);
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/051_sparse_off_t.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/051_sparse_off_t.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/051_sparse_off_t.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: ?
+# cset: n/a
+# inclusion: not submitted (?)
+# description: sparse off_t fixes
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/fs/readdir.c kernel-source-2.4.26-1/fs/readdir.c
--- kernel-source-2.4.26/fs/readdir.c 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/fs/readdir.c 2004-02-22 20:28:30.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: add missing #includes
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/net/wan/farsync.c kernel-source-2.4.26-1/drivers/net/wan/farsync.c
--- kernel-source-2.4.26/drivers/net/wan/farsync.c 2003-11-29 05:26:20.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/net/wan/farsync.c 2003-11-29 20:53:37.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted (not suitable?)
+# description: tighten GCC conditional for empty initializer workaround
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/include/linux/spinlock.h kernel-source-2.4.26-1/include/linux/spinlock.h
--- kernel-source-2.4.26/include/linux/spinlock.h 2004-02-19 00:36:32.000000000 +1100
+++ kernel-source-2.4.26-1/include/linux/spinlock.h 2004-02-22 20:28:34.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: forward declaration of net_device
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/include/linux/skbuff.h kernel-source-2.4.26-1/include/linux/skbuff.h
--- kernel-source-2.4.26/include/linux/skbuff.h 2004-04-14 23:05:40.000000000 +1000
+++ kernel-source-2.4.26-1/include/linux/skbuff.h 2004-04-17 14:24:06.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #58566
+# cset: n/a
+# inclusion: not submitted
+# description: fix argument handling in main.c
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/init/main.c kernel-source-2.4.26-1/init/main.c
--- kernel-source-2.4.26/init/main.c 2003-11-29 05:26:21.000000000 +1100
+++ kernel-source-2.4.26-1/init/main.c 2003-11-29 20:53:51.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: ECN is always available as a sysctl, so this check is wrong.
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/net/ipv4/tcp_diag.c kernel-source-2.4.26-1/net/ipv4/tcp_diag.c
--- kernel-source-2.4.26/net/ipv4/tcp_diag.c 2003-08-25 21:44:44.000000000 +1000
+++ kernel-source-2.4.26-1/net/ipv4/tcp_diag.c 2003-09-03 20:27:21.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #211717
+# cset: n/a
+# inclusion: not submitted
+# description: Do not unshare files for pid == 1 in kernel/fork.c
+# revision date: 2004-09-03
+
--- kernel-source-2.4.26/kernel/fork.c 2004-04-14 23:05:40.000000000 +1000
+++ kernel-source-2.4.26-1/kernel/fork.c 2004-04-17 14:24:07.000000000 +1000
@@ -562,7 +562,7 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: Fix printk warnings in do_mounts.c
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/init/do_mounts.c kernel-source-2.4.26-1/init/do_mounts.c
--- kernel-source-2.4.26/init/do_mounts.c 2003-11-29 05:26:21.000000000 +1100
+++ kernel-source-2.4.26-1/init/do_mounts.c 2003-11-29 20:53:51.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/059_ea_acl.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/059_ea_acl.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/059_ea_acl.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (kernel-patch-acl)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: Extended Attributes and Access Control Lists for Linux 2.4
+# revision date: 2004-09-03
+
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -16485,6 +16567,43 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/060_ipsec_update.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: bk
+# cset: 1.1722.10.22 (linux-2.6)
+# inclusion: n/a (only in linux-2.6 bk)
+# description: backport of some IPsec fixes from Herbert
+# revision date: 2004-09-03
+
#ChangeSet1.1722.10.22
# This is a BitKeeper generated diff -Nru style patch.
#
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/061_devmapper_1.00.19-2.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/061_devmapper_1.00.19-2.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/061_devmapper_1.00.19-2.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (kernel-patch-device-mapper, 2:1.00.19-2)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: device-mapper support for 2.4
+# revision date: 2004-09-03
+
diff -urN linux-2.4.26.orig/Documentation/Configure.help linux-2.4.26/Documentation/Configure.help
--- linux-2.4.26.orig/Documentation/Configure.help 2004-04-14 09:05:24.000000000 -0400
+++ linux-2.4.26/Documentation/Configure.help 2004-05-02 01:03:13.000000000 -0400
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/062_ide_stroke_runtime.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/062_ide_stroke_runtime.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/062_ide_stroke_runtime.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline (?)
+# description: allow passing of hdX=stroke to enable stroke at runtime
+# revision date: 2004-09-03
+
--- kernel-source-2.4.27-2.4.27/drivers/ide/ide.c~ 2004-08-12 22:38:36.000000000 -0700
+++ kernel-source-2.4.27-2.4.27/drivers/ide/ide.c 2004-08-12 22:39:01.000000000 -0700
@@ -2089,6 +2089,7 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/063_firmwareless_tg3.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/063_firmwareless_tg3.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/063_firmwareless_tg3.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (neroden)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: tg3 that's able to use firmware from userspace.
+# revision date: 2004-09-03
+
--- a/drivers/net/tg3.c 1970-01-01 10:00:00.000000000 +1000
+++ b/drivers/net/tg3.c 2004-08-13 10:14:36.000000000 -0700
@@ -0,0 +1,7968 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/064_driver_MODULE_LICENSE.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,9 +1,9 @@
-Many GPL'd modules are not marked as such for Sun stuff; also remove
-obsoleted EXPORT_NO_SYMBOLS. Verified with DaveM, this is not 'changing' the
-license.
+# origin: bk (joshk)
+# cset: 1.1447.4.11
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: add missing MODULE_LICENSE("GPL") to many files
+# revision date: 2004-09-03
- -- Josh 8/14/04
-
--- kernel-source-2.4.26/drivers/fc4/fc.c~ 2004-08-02 10:09:54.000000000 -0700
+++ kernel-source-2.4.26/drivers/fc4/fc.c 2004-08-02 10:10:09.000000000 -0700
@@ -1155,3 +1155,5 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/065_copy_user_parens.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: bk
+# cset: 1.1447.4.7
+# inclusion: kernel 2.4.28-pre1
+# description: binutils 2.15-1 choked on the old code, it's really not a gcc fix
+# revision date: 2004-09-03
+
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: superseded by 071_dep_fw_loader-2.diff
+# description: correct config deps for things that need FW_LOADER
+# revision date: 2004-09-03
+
--- kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in~ 2004-08-23 22:24:53.000000000 -0700
+++ kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in 2004-08-23 22:29:52.000000000 -0700
@@ -24,7 +24,15 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/067_tg3_ampersand.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: fix spurious ampersand in new firmwareless tg3 code for 2.4.27
+# revision date: 2004-09-03
+
--- a/drivers/net/tg3.c 2004-08-18 20:51:41.000000000 -0700
+++ b/drivers/net/tg3.c 2004-08-18 20:51:02.000000000 -0700
@@ -3911,7 +3911,7 @@
Modified: 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-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/068_ehci_oops.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: bk
+# cset: 1.1483
+# inclusion: kernel 2.4.28-pre2
+# description: fix ehci-hcd oops
+# revision date: 2004-09-03
+
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet@1.1483
Modified: 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-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/069_parisc_comment.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #266594
+# cset: n/a (imported into parisc-linux CVS)
+# inclusion: already imported into parisc-linux CVS
+# description: Fix unterminated comment
+# revision date: 2004-09-03
+
--- 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 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/070_ide_scan_pcibus.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: missing ide-probe.c patch that killed initrds
+# revision date: 2004-09-03
+
diff -urN kernel-source-2.4.26/drivers/ide/ide-probe.c kernel-source-2.4.26-1/drivers/ide/ide-probe.c
--- kernel-source-2.4.26/drivers/ide/ide-probe.c 2004-04-14 23:05:29.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/ide/ide-probe.c 2004-04-17 14:23:47.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: Second hunk not suitable for mainline, first hunk unsent
+# description: correct config dependencies for things requiring FW_LOADER
+# revision date: 2004-09-03
+
--- kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in~ 2004-08-23 22:24:53.000000000 -0700
+++ kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in 2004-08-23 22:29:52.000000000 -0700
@@ -24,7 +24,12 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/072_6300esb_sata.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,3 +1,9 @@
+# origin: Debian, #254748
+# cset: n/a
+# inclusion: not submitted
+# description: add PIIX support for ESB3 chipset
+# revision date: 2004-09-03
+
diff -Ndru kernel-source-2.4.26/drivers/ide/pci/piix.c kernel-source-2.4.26-pe750/drivers/ide/pci/piix.c
--- kernel-source-2.4.26/drivers/ide/pci/piix.c Wed Apr 14 13:05:30 2004
+++ kernel-source-2.4.26-pe750/drivers/ide/pci/piix.c Tue Jun 15 20:50:25 2004
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/073_tg3_hw_autoneg.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/073_tg3_hw_autoneg.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/073_tg3_hw_autoneg.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,71 +1,36 @@
-Path: main.gmane.org!not-for-mail
-From: "David S. Miller" <davem@davemloft.net>
-Newsgroups: gmane.linux.kernel
-Subject: Re: TG3 doesn't work in kernel 2.4.27 (David S. Miller)
-Date: Mon, 30 Aug 2004 16:11:26 -0700
-Lines: 24
-Sender: linux-kernel-owner@vger.kernel.org
-Approved: news@gmane.org
-Message-ID: <20040830161126.585a6b62.davem@davemloft.net>
-References: <20040816110000.1120.31256.Mailman@lists.us.dell.com>
- <200408162049.FFF09413.8592816B@anet.ne.jp>
- <20040816143824.15238e42.davem@redhat.com>
- <412CD101.4050406@sun.com>
- <20040825120831.55a20c57.davem@redhat.com>
- <412CF0E9.2010903@sun.com>
- <20040825175805.6807014c.davem@redhat.com>
- <412DC055.4070401@sun.com>
-NNTP-Posting-Host: deer.gmane.org
-Mime-Version: 1.0
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-X-Trace: sea.gmane.org 1093907722 14965 80.91.224.253 (30 Aug 2004 23:15:22 GMT)
-X-Complaints-To: usenet@sea.gmane.org
-NNTP-Posting-Date: Mon, 30 Aug 2004 23:15:22 +0000 (UTC)
-Cc: Michael.Waychison@sun.com, linux-kernel@vger.kernel.org
-Original-X-From: linux-kernel-owner+glk-linux-kernel=40m.gmane.org-S265211AbUH3XMe@vger.kernel.org Tue Aug 31 01:15:13 2004
-Return-path: <linux-kernel-owner+glk-linux-kernel=40m.gmane.org-S265211AbUH3XMe@vger.kernel.org>
-Original-Received: from vger.kernel.org ([12.107.209.244])
- by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
- id 1C1vMm-0002iL-00
- for <glk-linux-kernel@gmane.org>; Tue, 31 Aug 2004 01:15:13 +0200
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S265211AbUH3XMe (ORCPT <rfc822;glk-linux-kernel@m.gmane.org>);
- Mon, 30 Aug 2004 19:12:34 -0400
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265230AbUH3XMe
- (ORCPT <rfc822;linux-kernel-outgoing>);
- Mon, 30 Aug 2004 19:12:34 -0400
-Original-Received: from adsl-63-197-226-105.dsl.snfc21.pacbell.net ([63.197.226.105]:51864
- "EHLO cheetah.davemloft.net") by vger.kernel.org with ESMTP
- id S265211AbUH3XMb (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
- Mon, 30 Aug 2004 19:12:31 -0400
-Original-Received: from localhost
- ([127.0.0.1] helo=cheetah.davemloft.net ident=davem)
- by cheetah.davemloft.net with smtp (Exim 3.36 #1 (Debian))
- id 1C1vJ9-0008Kd-00; Mon, 30 Aug 2004 16:11:27 -0700
-Original-To: Brian Somers <brian.somers@sun.com>
-In-Reply-To: <412DC055.4070401@sun.com>
-X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu)
-X-Face: "_;p5u5aPsO,_Vsx"^v-pEq09'CU4&Dc1$fQExov$62l60cgCc%FnIwD=.UF^a>?5'9Kn[;433QFVV9M..2eN.@4ZWPGbdi<=?[:T>y?SD(R*-3It"Vj:)"dP
-Precedence: bulk
-X-Mailing-List: linux-kernel@vger.kernel.org
-Xref: main.gmane.org gmane.linux.kernel:231182
-X-Report-Spam: http://spam.gmane.org/gmane.linux.kernel:231182
+# origin: bk
+# cset: 1.1493.3.10
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: fix hw autoneg problems
+# revision date: 2004-09-03
-
-Michael Chan at Broadcom spotted the bug.
-
-Things are totally broken if the switch/hub does not support
-autonegotiation. Checking for the MAC_STATUS_SIGNAL_DET bit
-in the tg3 polling timer fixes the problem.
-
-This is probably why it worked for you and doesn't with the
-IBM blades as blades are more likely to be connected to
-non-autoneg'ing devices.
-
-===== drivers/net/tg3.c 1.199 vs edited =====
---- 1.199/drivers/net/tg3.c 2004-08-18 19:52:35 -07:00
-+++ edited/drivers/net/tg3.c 2004-08-30 15:08:07 -07:00
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/08/30 15:12:10-07:00 mchan@broadcom.com
+# [TG3]: Check MAC_STATUS_SIGNAL_DET in serdes polling.
+#
+# Otherwise we do not handle properly the case
+# where the switch/hub does not support auto-
+# negotiation. This is what was breaking 5704
+# hw fiber autoneg.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# drivers/net/tg3.c
+# 2004/08/30 15:11:48-07:00 mchan@broadcom.com +2 -1
+# [TG3]: Check MAC_STATUS_SIGNAL_DET in serdes polling.
+#
+# Otherwise we do not handle properly the case
+# where the switch/hub does not support auto-
+# negotiation. This is what was breaking 5704
+# hw fiber autoneg.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+diff -Nru a/drivers/net/tg3.c b/drivers/net/tg3.c
+--- a/drivers/net/tg3.c 2004-09-03 18:33:38 -07:00
++++ b/drivers/net/tg3.c 2004-09-03 18:33:38 -07:00
@@ -5602,7 +5602,8 @@
need_setup = 1;
}
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,5 +1,22 @@
---- kernel-source-2.4.27-2.4.27/drivers/net/fealnx.c~ 2004-08-30 01:53:29.000000000 -0700
-+++ kernel-source-2.4.27-2.4.27/drivers/net/fealnx.c 2004-08-30 01:53:33.000000000 -0700
+# origin: bk
+# cset: 1.1525.4.2
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: spurious ampersand in spin_unlock_irqrestore call
+# revision date: 2004-09-03
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/08/28 19:34:39-04:00 ha505@hszk.bme.hu
+# [netdrvr fealnx] fix spin_unlock_irqrestore() usage
+#
+# drivers/net/fealnx.c
+# 2004/08/28 19:34:37-04:00 ha505@hszk.bme.hu +1 -1
+# [netdrvr fealnx] fix spin_unlock_irqrestore() usage
+#
+diff -Nru a/drivers/net/fealnx.c b/drivers/net/fealnx.c
+--- a/drivers/net/fealnx.c 2004-09-03 18:37:08 -07:00
++++ b/drivers/net/fealnx.c 2004-09-03 18:37:08 -07:00
@@ -1796,7 +1796,7 @@
unsigned long flags;
spin_lock_irqsave(lp, flags);
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff 2004-09-03 21:51:54 UTC (rev 1542)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff 2004-09-04 05:00:11 UTC (rev 1543)
@@ -1,93 +1,62 @@
-Path: main.gmane.org!not-for-mail
-From: "David S. Miller" <davem@davemloft.net>
-Newsgroups: gmane.linux.ports.sparc,gmane.linux.debian.ports.sparc
-Subject: [PATCH] Re: lvm problems on sparc64 - Trying to vfree() nonexistent
- vm area
-Date: Mon, 30 Aug 2004 17:40:15 -0700
-Organization: DaveM Loft Enterprises
-Lines: 80
-Sender: sparclinux-owner@vger.kernel.org
-Approved: news@gmane.org
-Message-ID: <20040830174015.10edb69b.davem@davemloft.net>
-References: <1093911340.2116.55.camel@duncow>
-NNTP-Posting-Host: deer.gmane.org
-Mime-Version: 1.0
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-X-Trace: sea.gmane.org 1093912932 25423 80.91.224.253 (31 Aug 2004 00:42:12 GMT)
-X-Complaints-To: usenet@sea.gmane.org
-NNTP-Posting-Date: Tue, 31 Aug 2004 00:42:12 +0000 (UTC)
-Cc: sparclinux@vger.kernel.org, debian-sparc@lists.debian.org,
- richm@oldelvet.org.uk, linux-lvm@sistina.com
-Original-X-From: sparclinux-owner@vger.kernel.org Tue Aug 31 02:42:02 2004
-Return-path: <sparclinux-owner@vger.kernel.org>
-Original-Received: from vger.kernel.org ([12.107.209.244])
- by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
- id 1C1win-00077m-00
- for <lnx-sparclinux@gmane.org>; Tue, 31 Aug 2004 02:42:02 +0200
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S265847AbUHaAlj (ORCPT <rfc822;lnx-sparclinux@m.gmane.org>);
- Mon, 30 Aug 2004 20:41:39 -0400
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265909AbUHaAlj
- (ORCPT <rfc822;sparclinux-outgoing>);
- Mon, 30 Aug 2004 20:41:39 -0400
-Original-Received: from smtp110.mail.sc5.yahoo.com ([66.163.170.8]:61347 "HELO
- smtp110.mail.sc5.yahoo.com") by vger.kernel.org with SMTP
- id S265847AbUHaAld (ORCPT <rfc822;sparclinux@vger.kernel.org>);
- Mon, 30 Aug 2004 20:41:33 -0400
-Original-Received: from unknown (HELO cheetah.davemloft.net) (davem?330@63.197.226.105 with login)
- by smtp110.mail.sc5.yahoo.com with SMTP; 31 Aug 2004 00:41:33 -0000
-Original-To: Richard Mortimer <richm@oldelvet.org.uk>,
- marcelo.tosatti@cyclades.com
-In-Reply-To: <1093911340.2116.55.camel@duncow>
-X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu)
-Precedence: bulk
-X-Mailing-List: sparclinux@vger.kernel.org
-Xref: main.gmane.org gmane.linux.ports.sparc:4049 gmane.linux.debian.ports.sparc:7148
-X-Report-Spam: http://spam.gmane.org/gmane.linux.ports.sparc:4049
+# origin: bk
+# cset: 1.1531
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: LVM 32-bit ioctl problems fixed
+# revision date: 2004-09-03
-On Tue, 31 Aug 2004 01:15:40 +0100
-Richard Mortimer <richm@oldelvet.org.uk> wrote:
-
-> I'm seeing problems with lvm on sparc64. I have a reproducible test case
-> using snapshots where I can reliably reproduce an error similar to
->
-> Trying to vfree() nonexistent vm area (0000000140072000)
-
-For once it's not sparc64's fault, it's a bug in the generic
-LVM ioctl handling :-)
-
-It saves both pointers, clobbers the userspace copy, then only
-restores one of the two pointers correctly. Easy to fix, see
-below.
-
-Marcelo, please apply, thanks.
-
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
-# 2004/08/30 17:24:05-07:00 davem@nuts.davemloft.net
-# [LVM]: Do not forget to restore both user pointers.
+# 2004/08/31 07:38:21-03:00 davem@davemloft.net
+# [PATCH] LVM ioctl fix - Trying to vfree() nonexistent vm area
#
-# This in particular can make compatability layers
-# crash, and it is a bug for regular applications
-# too.
+# On Tue, 31 Aug 2004 01:15:40 +0100
+# Richard Mortimer <richm@oldelvet.org.uk> wrote:
#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# drivers/md/lvm.c
-# 2004/08/30 17:23:48-07:00 davem@nuts.davemloft.net +12 -0
-# [LVM]: Do not forget to restore both user pointers.
+# > I'm seeing problems with lvm on sparc64. I have a reproducible test case
+# > using snapshots where I can reliably reproduce an error similar to
+# >
+# > Trying to vfree() nonexistent vm area (0000000140072000)
#
-# This in particular can make compatability layers
-# crash, and it is a bug for regular applications
-# too.
+# For once it's not sparc64's fault, it's a bug in the generic
+# LVM ioctl handling :-)
#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
+# It saves both pointers, clobbers the userspace copy, then only
+# restores one of the two pointers correctly. Easy to fix, see
+# below.
+#
+# Marcelo, please apply, thanks.
+#
+# # This is a BitKeeper generated diff -Nru style patch.
+# #
+# # ChangeSet
+# # 2004/08/30 17:24:05-07:00 davem@nuts.davemloft.net
+# # [LVM]: Do not forget to restore both user pointers.
+# #
+# # This in particular can make compatability layers
+# # crash, and it is a bug for regular applications
+# # too.
+# #
+# # Signed-off-by: David S. Miller <davem@davemloft.net>
+# #
+# # drivers/md/lvm.c
+# # 2004/08/30 17:23:48-07:00 davem@nuts.davemloft.net +12 -0
+# # [LVM]: Do not forget to restore both user pointers.
+# #
+# # This in particular can make compatability layers
+# # crash, and it is a bug for regular applications
+# # too.
+# #
+# # Signed-off-by: David S. Miller <davem@davemloft.net>
+# #
#
+# drivers/md/lvm.c
+# 2004/08/30 21:24:13-03:00 davem@davemloft.net +12 -0
+# LVM ioctl fix - Trying to vfree() nonexistent vm area
+#
diff -Nru a/drivers/md/lvm.c b/drivers/md/lvm.c
---- a/drivers/md/lvm.c 2004-08-30 17:24:13 -07:00
-+++ b/drivers/md/lvm.c 2004-08-30 17:24:13 -07:00
+--- a/drivers/md/lvm.c 2004-09-03 20:37:17 -07:00
++++ b/drivers/md/lvm.c 2004-09-03 20:37:17 -07:00
@@ -2689,6 +2689,10 @@
(&lv_status_byname_req.lv->lv_current_pe,
&saved_ptr1, sizeof(void *)) != 0)
@@ -121,8 +90,3 @@
sizeof(void *)) != 0)
return -EFAULT;
--
-To unsubscribe from this list: send the line "unsubscribe sparclinux" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-