From 9899e00ed9fe95a5afddab81d3ec7b5c1ec53d86 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 12 Apr 2007 11:40:14 +0000 Subject: [PATCH] Added mptsas to SCSI for bug #174130 and removing raid0/raid1/raid10/raid456 from DMRAID. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@507 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 6 ++++++ alpha/modules_load | 4 ++-- ia64/modules_load | 4 ++-- um/modules_load | 4 ++-- x86/modules_load | 4 ++-- x86_64/modules_load | 4 ++-- xen0/modules_load | 4 ++-- xenU/modules_load | 4 ++-- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18dbb18..1602ea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Apr 2007; Chris Gianelloni alpha/modules_load, + ia64/modules_load, um/modules_load, x86/modules_load, x86_64/modules_load, + xen0/modules_load, xenU/modules_load: + Added mptsas to SCSI for bug #174130 and removing raid0/raid1/raid10/raid456 + from DMRAID. + 12 Apr 2007; Chris Gianelloni gen_initramfs.sh, gen_initrd.sh: Commented out the checks on the sanity of lvm.conf since they were not quite diff --git a/alpha/modules_load b/alpha/modules_load index 7ca57e2..53db374 100644 --- a/alpha/modules_load +++ b/alpha/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,5 +21,5 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs" diff --git a/ia64/modules_load b/ia64/modules_load index 2fec77d..714fa1b 100644 --- a/ia64/modules_load +++ b/ia64/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" diff --git a/um/modules_load b/um/modules_load index 1c4a0ee..714fa1b 100644 --- a/um/modules_load +++ b/um/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" diff --git a/x86/modules_load b/x86/modules_load index 2fec77d..714fa1b 100644 --- a/x86/modules_load +++ b/x86/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" diff --git a/x86_64/modules_load b/x86_64/modules_load index 2fec77d..714fa1b 100644 --- a/x86_64/modules_load +++ b/x86_64/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" diff --git a/xen0/modules_load b/xen0/modules_load index 2fec77d..714fa1b 100644 --- a/xen0/modules_load +++ b/xen0/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" diff --git a/xenU/modules_load b/xenU/modules_load index 2fec77d..714fa1b 100644 --- a/xenU/modules_load +++ b/xenU/modules_load @@ -7,7 +7,7 @@ qlogicfas qlogicfc qlogicisp \ seagate t128 u14-34f ultrastor wd7000 \ NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \ sim710 sym53c416 dc395x atp870u mptbase mptscsih \ -mptspi mptfc 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ +mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 \ sx8 aacraid megaraid_mbox megaraid_mm megaraid_sas \ lpfc scsi_transport_fc scsi_wait_scan" @@ -21,7 +21,7 @@ ohci-hcd usbhid sl811-hcd" MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \ raid456 raid5 raid6 raid10" -MODULES_DMRAID="dm-mod dm-mirror raid0 raid1 raid10 raid456" +MODULES_DMRAID="dm-mod dm-mirror" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \ ata_piix sata_mv pdc_adma scsi_wait_scan" -- 2.26.2