commit:     36b198eb61daa7550f282de20f078d036893f92d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 03:01:38 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 03:01:38 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=36b198eb

modules_load: sync MODULES_NVME, drop nvme-target.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 arch/alpha/modules_load    | 2 +-
 arch/arm/modules_load      | 2 +-
 arch/ia64/modules_load     | 2 +-
 arch/mips/modules_load     | 2 +-
 arch/parisc/modules_load   | 2 +-
 arch/parisc64/modules_load | 2 +-
 arch/ppc/modules_load      | 2 +-
 arch/ppc64/modules_load    | 2 +-
 arch/ppc64le/modules_load  | 2 +-
 arch/s390/modules_load     | 2 +-
 arch/sparc/modules_load    | 2 +-
 arch/sparc64/modules_load  | 2 +-
 arch/um/modules_load       | 2 +-
 arch/x86/modules_load      | 2 +-
 arch/x86_64/modules_load   | 2 +-
 defaults/modules_load      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index ddecb41..7ec5073 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index ddecb41..7ec5073 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index ddecb41..7ec5073 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/ppc64le/modules_load b/arch/ppc64le/modules_load
index ddecb41..7ec5073 100644
--- a/arch/ppc64le/modules_load
+++ b/arch/ppc64le/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/s390/modules_load b/arch/s390/modules_load
index 5a93b18..cb199eb 100644
--- a/arch/s390/modules_load
+++ b/arch/s390/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index ddecb41..7ec5073 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index ddecb41..7ec5073 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/um/modules_load b/arch/um/modules_load
index 196d080..316162b 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index af66451..021867b 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -9,7 +9,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index e0bf94c..8074eb0 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma 
nvme-fc"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas 
virtio_scsi virtio_blk"

diff --git a/defaults/modules_load b/defaults/modules_load
index b17b84a..9aa16c1 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -8,7 +8,7 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache 
dm-cache-smq dm-crypt dm-del
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length 
dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvmet nvmet-rdma"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop"
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n 
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform 
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp 
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex 
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n 
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 
pata_sl82c105 libata"
 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 
sata_inic162x pdc_adma"
 MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic 
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth 
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate 
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx 
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox 
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas"

Reply via email to