git: 46ebf11f5a32 - main - MAINTAINERS: Add myself for nvme entries, remove jimharris

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=46ebf11f5a328bc7c57ecc7c0d7eea64113d3441

commit 46ebf11f5a328bc7c57ecc7c0d7eea64113d3441
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-01-12 19:07:28 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-01-12 19:12:15 +0000

    MAINTAINERS: Add myself for nvme entries, remove jimharris
    
    Jim Harris no longer has a commit bit and has moved on from being the
    FreeBSD nvme driver maintainer at Intel. I've been reviewing things
    so I'll take that up.
    
    Sponsored by:           Netflix
---
 .github/CODEOWNERS | 3 +++
 MAINTAINERS        | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6ac937a33a0a..3abef8d6b88e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -57,6 +57,7 @@
 /lib/libpam/		@dag-erling
 /lib/libvmmapi	@bsdjhb @grehan-freebsd
 /libexec/rc/rc.d/rctl/	@trasz
+/sbin/nvmecontrol @bsdimp
 /sbin/mount_fusefs @asomers
 /secure/usr.bin/openssl/	@juikim
 /share/mk	@bsdimp @bapt @bdrewery @emaste
@@ -73,6 +74,8 @@
 /sys/crypto/openssl/	@juikim
 /sys/dev/drm2	@bsdimp
 /sys/dev/iscsi/	@trasz
+/sys/dev/nvd	@bsdimp
+/sys/dev/nvme	@bsdimp
 /sys/dev/pci	@bsdimp @bsdjhb
 /sys/fs/autofs/	@trasz
 /sys/fs/fuse/	@asomers
diff --git a/MAINTAINERS b/MAINTAINERS
index 12a65757f54a..54486867eed6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -56,7 +56,6 @@ etc/sendmail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
 fetch		des	Pre-commit review requested, email only.
 fusefs(5)	asomers	Pre-commit review requested.
 geli		pjd	Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/).
-isci(4)		jimharris	Pre-commit review requested.
 iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 kqueue		jmg	Pre-commit review requested.  Documentation Required.
@@ -71,9 +70,9 @@ lpr		gad	Pre-commit review requested, particularly for
 nanobsd		imp	Pre-commit phabricator review requested.
 net80211	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 nfs		freebsd-fs@FreeBSD.org, rmacklem is best for reviews.
-nvd(4)		jimharris	Pre-commit review requested.
-nvme(4)		jimharris	Pre-commit review requested.
-nvmecontrol(8)	jimharris	Pre-commit review requested.
+nvd(4)		imp	Pre-commit review requested.
+nvme(4)		imp	Pre-commit review requested.
+nvmecontrol(8)	imp	Pre-commit review requested.
 opencrypto	jmg	Pre-commit review requested.  Documentation Required.
 openssh		des	Pre-commit review requested, email only.
 openssl		benl	Pre-commit review requested.
@@ -128,8 +127,6 @@ autofs(5)	trasz	Pre-commit review recommended.
 iscsi(4)	trasz	Pre-commit review recommended.
 rctl(8)		trasz	Pre-commit review recommended.
 sys/dev/ofw	nwhitehorn	Pre-commit review recommended.
-sys/dev/drm*	imp	Pre-commit review requested in phabricator. Changes need to
-			be mirrored in github repo.
 sys/dev/usb/wlan adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 sys/arm/allwinner	manu	Pre-commit review requested
 sys/arm64/rockchip	manu	Pre-commit review requested