r2129 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Christoph Hellwig
hch-guest@costa.debian.org
Wed, 05 Jan 2005 16:26:59 +0100
Author: hch-guest
Date: 2005-01-05 16:26:58 +0100 (Wed, 05 Jan 2005)
New Revision: 2129
Removed:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/drivers-scsi-generic_proc_info.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
Log:
drop drivers-scsi-generic_proc_info.dpatch
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-05 05:07:07 UTC (rev 2128)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-05 15:26:58 UTC (rev 2129)
@@ -186,6 +186,9 @@
* 027-track_dummy_capability-2.dpatch
Fix patch 025-track_dummy_capability.dpatch (Andres Salomon).
+ * Dropped drivers-scsi-generic_proc_info.dpatch, kernel-image packages based
+ on this release need to depend on initrd-tools >= 0.1.76 (Christoph Hellwig)
+
-- Andres Salomon <dilinger@voxel.net> Tue, 04 Jan 2005 23:52:23 -0500
kernel-source-2.6.9 (2.6.9-4) unstable; urgency=low
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/drivers-scsi-generic_proc_info.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/drivers-scsi-generic_proc_info.dpatch 2005-01-05 05:07:07 UTC (rev 2128)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/drivers-scsi-generic_proc_info.dpatch 2005-01-05 15:26:58 UTC (rev 2129)
@@ -1,92 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: restore generic SCSI proc_info function in drivers/scsi/scsi_proc.c
-## DP: Patch author: unknown
-## DP: Upstream status: rejected
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-diff -urN kernel-source-2.6.6/drivers/scsi/scsi_proc.c kernel-source-2.6.6-1/drivers/scsi/scsi_proc.c
---- kernel-source-2.6.6/drivers/scsi/scsi_proc.c 2004-03-11 13:55:22.000000000 +1100
-+++ kernel-source-2.6.6-1/drivers/scsi/scsi_proc.c 2004-02-16 18:23:47.000000000 +1100
-@@ -42,13 +42,47 @@
- /* Protect sht->present and sht->proc_dir */
- static DECLARE_MUTEX(global_host_template_sem);
-
-+/* Used if the driver currently has no own support for /proc/scsi */
-+static int generic_proc_info(char *buffer, char **start, off_t offset,
-+ int count, const char *(*info)(struct Scsi_Host *),
-+ struct Scsi_Host *shost)
-+{
-+ int len, pos, begin = 0;
-+ static const char noprocfs[] =
-+ "The driver does not yet support the proc-fs\n";
-+
-+ if (info && shost)
-+ len = sprintf(buffer, "%s\n", info(shost));
-+ else
-+ len = sprintf(buffer, "%s\n", noprocfs);
-+
-+ pos = len;
-+ if (pos < offset) {
-+ len = 0;
-+ begin = pos;
-+ }
-+
-+ *start = buffer + (offset - begin);
-+ len -= (offset - begin);
-+ if (len > count)
-+ len = count;
-+
-+ return len;
-+}
-+
- static int proc_scsi_read(char *buffer, char **start, off_t offset,
- int length, int *eof, void *data)
- {
- struct Scsi_Host *shost = data;
- int n;
-
-- n = shost->hostt->proc_info(shost, buffer, start, offset, length, 0);
-+ if (shost->hostt->proc_info == NULL)
-+ n = generic_proc_info(buffer, start, offset, length,
-+ shost->hostt->info, shost);
-+ else
-+ n = shost->hostt->proc_info(shost, buffer, start, offset,
-+ length, 0);
-+
- *eof = (n < length);
-
- return n;
-@@ -62,6 +96,8 @@
- char *page;
- char *start;
-
-+ if (!shost->hostt->proc_info)
-+ return -ENOSYS;
- if (count > PROC_BLOCK_SIZE)
- return -EOVERFLOW;
-
-@@ -79,9 +115,6 @@
-
- void scsi_proc_hostdir_add(struct scsi_host_template *sht)
- {
-- if (!sht->proc_info)
-- return;
--
- down(&global_host_template_sem);
- if (!sht->present++) {
- sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
-@@ -96,9 +129,6 @@
-
- void scsi_proc_hostdir_rm(struct scsi_host_template *sht)
- {
-- if (!sht->proc_info)
-- return;
--
- down(&global_host_template_sem);
- if (!--sht->present && sht->proc_dir) {
- remove_proc_entry(sht->proc_name, proc_scsi);
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-05 05:07:07 UTC (rev 2128)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-05 15:26:58 UTC (rev 2129)
@@ -29,7 +29,6 @@
+ drivers-net-8139too-locking.dpatch
+ drivers-net-tg3-readd.dpatch
+ drivers-scsi_changer.dpatch
-+ drivers-scsi-generic_proc_info.dpatch
+ fs-asfs.dpatch
+ modular-ide.dpatch
+ modular-ide-pnp.dpatch