The patch titled cciss: fix pci ssid for the E500 controller has been added to the -mm tree. Its filename is cciss-fix-pci-ssid-for-the-e500-controller.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: cciss: fix pci ssid for the E500 controller From: Mike Miller <mike.miller@xxxxxx> Change the SSID on the E500 as a workaround for a firmware bug. It looks like the original patch was backed out between rc2 and rc4. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/block/cciss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/block/cciss.c~cciss-fix-pci-ssid-for-the-e500-controller drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-fix-pci-ssid-for-the-e500-controller +++ a/drivers/block/cciss.c @@ -82,7 +82,7 @@ static const struct pci_device_id cciss_ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3213}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3214}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3233}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237}, {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, {0,} @@ -114,7 +114,7 @@ static struct board_type products[] = { {0x3213103C, "Smart Array E200i", &SA5_access, 120}, {0x3214103C, "Smart Array E200i", &SA5_access, 120}, {0x3215103C, "Smart Array E200i", &SA5_access, 120}, - {0x3233103C, "Smart Array E500", &SA5_access, 512}, + {0x3237103C, "Smart Array E500", &SA5_access, 512}, {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120}, }; _ Patches currently in -mm which might be from mike.miller@xxxxxx are cciss-version-change.patch cciss-reference-driver-support.patch cciss-increase-number-of-commands-on-controller.patch cciss-fix-pci-ssid-for-the-e500-controller.patch cciss-disable-dma-prefetch-on-p600.patch cciss-set-sector_size-to-2048-for-performance.patch cciss-set-sector_size-to-2048-for-performance-tidy.patch cciss-change-cciss_open-for-consistency.patch cciss-remove-unused-revalidate_allvol-function.patch cciss-add-support-for-1024-logical-volumes.patch cciss-cleanup-cciss_interrupt-mode.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html