r2383 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-23 22:32:45 +0100 (Sun, 23 Jan 2005)
New Revision: 2383

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
Log:
proper deletion of sata-nv-fix; no need keeping it around


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-23 21:26:18 UTC (rev 2382)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-23 21:32:45 UTC (rev 2383)
@@ -30,13 +30,9 @@
 
   * Backport amd64 32bit quotactl support from 2.6.10. (Frederik Schüler)
 
-  * Backport sata-nv device detection fix from 2.6.10. (Frederik Schüler)
-
   * Change $((exp) | exp) to $( (exp) | exp) in apply so things work 
     with dash (Simon Horman) (See: #291107, #291039)
 
-  * Drop sata-nv-fix backport (Andres Salomon).
-
   * scsi-ioctl.dpatch
     Provide a warning about unknown opcodes (Andres Salomon).
 

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch	2005-01-23 21:26:18 UTC (rev 2382)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sata-nv-fix.dpatch	2005-01-23 21:32:45 UTC (rev 2383)
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## nv-sata-fix.dpatch by  <fschueler@gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fix sata-nv device detection
-## DP: Patch author: jgarzik@pobox.com
-## DP: Upstream status: backport from 2.6.10
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/12/22 18:58:50-05:00 jgarzik@pobox.com 
-#   [libata sata_nv] fix dev detect by removing sata-reset flag
-#   
-#   Remove ATA_FLAG_SATA_RESET.  See comment in code and
-#   http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.
-#   
-#   This problem needs more investigation.  Removing the flag
-#   appears to fix the problems in the field, so it's the best
-#   temporary solution.
-# 
-# drivers/scsi/sata_nv.c
-#   2004/12/22 18:58:44-05:00 jgarzik@pobox.com +9 -1
-#   [libata sata_nv] fix dev detect by removing sata-reset flag
-#   
-#   Remove ATA_FLAG_SATA_RESET.  See comment in code and
-#   http://bugme.osdl.org/show_bug.cgi?id=3352 for more details.
-#   
-#   This problem needs more investigation.  Removing the flag
-#   appears to fix the problems in the field, so it's the best
-#   temporary solution.
-# 
-diff -Nru a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
---- a/drivers/scsi/sata_nv.c	2005-01-16 22:49:58 -08:00
-+++ b/drivers/scsi/sata_nv.c	2005-01-16 22:49:58 -08:00
-@@ -218,10 +218,18 @@
- 	.host_stop		= nv_host_stop,
- };
- 
-+/* FIXME: The hardware provides the necessary SATA PHY controls
-+ * to support ATA_FLAG_SATA_RESET.  However, it is currently
-+ * necessary to disable that flag, to solve misdetection problems.
-+ * See http://bugme.osdl.org/show_bug.cgi?id=3352 for more info.
-+ *
-+ * This problem really needs to be investigated further.  But in the
-+ * meantime, we avoid ATA_FLAG_SATA_RESET to get people working.
-+ */
- static struct ata_port_info nv_port_info = {
- 	.sht		= &nv_sht,
- 	.host_flags	= ATA_FLAG_SATA |
--			  ATA_FLAG_SATA_RESET |
-+			  /* ATA_FLAG_SATA_RESET | */
- 			  ATA_FLAG_SRST |
- 			  ATA_FLAG_NO_LEGACY,
- 	.pio_mask	= NV_PIO_MASK,