add info about 3 merged patches:

finally remove add scsi changer (thanks hch)
remove ide dma blacklist toshiba

svn path=/dists/trunk/linux-2.6/; revision=4198
This commit is contained in:
maximilian attems 2005-09-14 09:52:33 +00:00
parent 892b6edd16
commit 6c38278517
3 changed files with 6 additions and 1505 deletions

7
debian/changelog vendored
View File

@ -53,7 +53,12 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
* add m68k-42_dma.patch and m68k-sonic.patch that will be in upstream 2.6.14
(which makes sun3 build fail, needs fixing)
-- Bastian Blank <waldi@debian.org> Wed, 14 Sep 2005 10:02:21 +0000
[ maximilian attems ]
* Drop drivers-add-scsi_changer.patch (merged)
* Drop drivers-ide-dma-blacklist-toshiba.patch (merged)
* Drop drivers-ide-__devinit.patch (merged)
-- maximilian attems <maks@sternwelten.at> Wed, 14 Sep 2005 11:45:23 +0200
linux-2.6 (2.6.12-6) unstable; urgency=high

File diff suppressed because it is too large Load Diff

View File

@ -1,22 +0,0 @@
#! /bin/sh -e
## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: blacklist "TOSHIBA CD-ROM XM-1702BC" in drivers/ide/ide-dma.c
## DP: Patch author: Herbert Xu -> #222939
## see also -> http://lists.debian.org/debian-boot/1999/02/msg00016.html
## DP: Upstream status: submitted
. $(dirname $0)/DPATCH
@DPATCH@
--- kernel-source-2.6.6/drivers/ide/ide-dma.c 2004-04-05 19:49:28.000000000 +1000
+++ kernel-source-2.6.6-1/drivers/ide/ide-dma.c 2004-04-05 20:54:34.000000000 +1000
@@ -125,6 +125,7 @@
{ "HITACHI CDR-8335" , "ALL" },
{ "HITACHI CDR-8435" , "ALL" },
{ "Toshiba CD-ROM XM-6202B" , "ALL" },
+ { "TOSHIBA CD-ROM XM-1702BC" , "ALL" },
{ "CD-532E-A" , "ALL" },
{ "E-IDE CD-ROM CR-840", "ALL" },
{ "CD-ROM Drive/F5A", "ALL" },