Index: conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.850
diff -u -p -r1.850 GENERIC
--- conf/GENERIC	22 Jan 2020 05:06:19 -0000	1.850
+++ conf/GENERIC	17 Jun 2020 05:10:04 -0000
@@ -468,6 +468,7 @@ uha*	at eisa?		# UltraStor 24f SCSI cont
 wds0	at isa? disable port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
 #wds1	at isa? port 0x358 irq 11 drq 5
 vmwpvs*	at pci?			# VMware ParaVirtual SCSI
+nvme*	at pci?			# NVMe controllers
 
 scsibus* at scsi?
 sd*	at scsibus?		# SCSI disk drives
Index: conf/RAMDISK_CD
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/RAMDISK_CD,v
retrieving revision 1.242
diff -u -p -r1.242 RAMDISK_CD
--- conf/RAMDISK_CD	20 Mar 2020 16:12:07 -0000	1.242
+++ conf/RAMDISK_CD	17 Jun 2020 05:10:04 -0000
@@ -162,6 +162,8 @@ pcscp*		at pci?			# AMD 53c974 PCscsi-PC
 uha0		at isa? port 0x330	# UltraStor [13]4f SCSI controllers
 uha*		at eisa?		# UltraStor 24f SCSI controllers
 vmwpvs*		at pci?			# VMware ParaVirtual SCSI
+nvme*		at pci?			# NVMe controllers
+
 softraid0	at root
 
 scsibus*	at scsi?