From 100388fdd03292e159a16d933e00602a2ec63b1a Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 16 Mar 2010 03:34:40 +0000 Subject: [PATCH] add stable 2.6.33.1 less work on this side ;) svn path=/dists/trunk/linux-2.6/; revision=15394 --- debian/changelog | 3 ++ ...si-qla1280-request-firmware-unlocked.patch | 35 ------------------- .../sparc/video-sunxvr500-intergraph.patch | 11 ------ debian/patches/series/base | 2 ++ 4 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch delete mode 100644 debian/patches/features/sparc/video-sunxvr500-intergraph.patch diff --git a/debian/changelog b/debian/changelog index 0f8e3f12d..64e258350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ linux-2.6 (2.6.33-1~experimental.4) UNRELEASED; urgency=low again (Closes: #572067) * [x86] Enable rtl8192su driver using external firmware + [ maximilian attems] + * Add stable 2.6.33.1. + -- Ben Hutchings Sat, 13 Mar 2010 23:06:49 +0000 linux-2.6 (2.6.33-1~experimental.3) experimental; urgency=low diff --git a/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch b/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch deleted file mode 100644 index 85d9bed27..000000000 --- a/debian/patches/bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 480c1e36532fc2783834d9582a11fbf1d493af42 -Author: Ben Hutchings -Date: Sun Aug 16 03:42:24 2009 +0100 - - qla1280: Drop host_lock while requesting firmware - - request_firmware() may sleep and it appears to be safe to release the - spinlock here. - -diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c -index 5defe5e..97cbf12 100644 ---- a/drivers/scsi/qla1280.c -+++ b/drivers/scsi/qla1280.c -@@ -1642,8 +1642,10 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha) - uint16_t mb[MAILBOX_REGISTER_COUNT], i; - int err; - -+ spin_unlock_irq(ha->host->host_lock); - err = request_firmware(&fw, ql1280_board_tbl[ha->devnum].fwname, - &ha->pdev->dev); -+ spin_lock_irq(ha->host->host_lock); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - ql1280_board_tbl[ha->devnum].fwname, err); -@@ -1701,8 +1703,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) - return -ENOMEM; - #endif - -+ spin_unlock_irq(ha->host->host_lock); - err = request_firmware(&fw, ql1280_board_tbl[ha->devnum].fwname, - &ha->pdev->dev); -+ spin_lock_irq(ha->host->host_lock); - if (err) { - printk(KERN_ERR "Failed to load image \"%s\" err %d\n", - ql1280_board_tbl[ha->devnum].fwname, err); diff --git a/debian/patches/features/sparc/video-sunxvr500-intergraph.patch b/debian/patches/features/sparc/video-sunxvr500-intergraph.patch deleted file mode 100644 index dc03e6058..000000000 --- a/debian/patches/features/sparc/video-sunxvr500-intergraph.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c ---- a/drivers/video/sunxvr500.c 2008-11-20 18:02:37.000000000 -0500 -+++ b/drivers/video/sunxvr500.c 2008-12-01 15:43:04.000000000 -0500 -@@ -396,6 +396,7 @@ - - static struct pci_device_id e3d_pci_table[] = { - { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0), }, -+ { PCI_DEVICE(0x1091, 0x7a0), }, - { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2), }, - { .vendor = PCI_VENDOR_ID_3DLABS, - .device = PCI_ANY_ID, diff --git a/debian/patches/series/base b/debian/patches/series/base index 666dc7fd2..e9c137bab 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -60,3 +60,5 @@ + features/arm/openrd-base-uart.patch #+ features/all/ath9k-add-support-for-802.11n-bonded-out-AR2427.patch + features/all/rtl8192su-always-use-request_firmware.patch + ++ bugfix/all/stable/2.6.33.1.patch