git: 8f7105a20697 - main - NOTES: Move NVMe entries to MI file

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=8f7105a20697d47060dbedc966cf085a64aeced6

commit 8f7105a20697d47060dbedc966cf085a64aeced6
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-09 22:02:58 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-04-09 22:02:58 +0000

    NOTES: Move NVMe entries to MI file
    
    While here, adjust the sample setting for NVME_USE_NVD to use a
    non-default setting as is typical in entries in NOTES.
    
    Discussed with: imp
    Reviewed by:    manu
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D44691
---
 sys/amd64/conf/NOTES |  5 -----
 sys/arm64/conf/NOTES |  5 -----
 sys/conf/NOTES       | 11 +++++++++++
 sys/i386/conf/NOTES  |  5 -----
 sys/riscv/conf/NOTES |  5 -----
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 761728337ac2..39ecfb529be5 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -439,11 +439,6 @@ device		imcsmb
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-#
-# NVM Express (NVMe) support
-device         nvme    # base NVMe driver
-device         nvd     # expose NVMe namespaces as disks, depends on nvme
-
 #
 # Intel Volume Management Device (VMD) support
 device		vmd
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index 21b1b22a5f01..91455d6032b9 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -102,11 +102,6 @@ device		ice_ddp		# Intel 800 Series DDP Package
 # Etherswitch devices
 device		e6000sw		# Marvell mv88e6085 based switches
 
-# NVM Express (NVMe) support
-device		nvme		# base NVMe driver
-options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
-device		nvd		# expose NVMe namespaces as disks, depends on nvme
-
 # MMC/SD/SDIO Card slot support
 device		sdhci_xenon		# Marvell Xenon SD/MMC controller
 device		aw_mmc			# Allwinner SD/MMC controller
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cf447004cb92..e3332ee20120 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1675,6 +1675,17 @@ device		mfip		# LSI MegaRAID SAS passthrough, requires CAM
 options 	MFI_DEBUG
 device		mrsas		# LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
 
+# NVM Express
+#
+# nvme:	PCI-express NVM Express host controllers
+# nda:	CAM NVMe disk driver
+# nvd:	non-CAM NVMe disk driver
+
+device		nvme		# base NVMe driver
+options 	NVME_USE_NVD=1	# Use nvd(4) instead of the CAM nda(4) driver
+device		nda		# NVMe direct access devices (aka disks)
+device		nvd		# expose NVMe namespaces as disks, depends on nvme
+
 #
 # Serial ATA host controllers:
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 45613c10c583..6692a9dba10e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -634,11 +634,6 @@ device		ips
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-#
-# NVM Express (NVMe) support
-device         nvme    # base NVMe driver
-device         nvd     # expose NVMe namespaces as disks, depends on nvme
-
 #
 # Intel Volume Management Device (VMD) support
 device		vmd
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
index f6b27a626dfb..d818fd0581c3 100644
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -40,11 +40,6 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_mmio		# VirtIO MMIO bus
 device		virtio_random		# VirtIO Entropy device
 
-# NVM Express (NVMe) support
-device		nvme		# base NVMe driver
-options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
-device		nvd		# expose NVMe namespaces as disks, depends on nvme
-
 # MMC/SD/SDIO Card slot support
 device		dwmmc