summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-09-06 10:00:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-09-06 10:00:25 -0700
commit03085b3d5a45a60061423ac4857f339c7cb260ff (patch)
treee08ddff466ec03b32813c09445d4cf26912724de
parenteebb4159a2bf660b545ecb6ee318179971d610a2 (diff)
parent55d1308bdff7341b778e5cf36220616a0dd6ab8f (diff)
Merge tag 'misc-5.15-2021-09-05' of git://git.kernel.dk/linux-block
Pull CDROM maintainer update from Jens Axboe: "It's been about 22 years since I originally started maintaining the CDROM code, and I just haven't been able to even get reviews done in a timely fashion the last handful of years. Time to pass it on, and Phillip has volunteered take over these duties. I'll be helping as needed for the foreseeable future" * tag 'misc-5.15-2021-09-05' of git://git.kernel.dk/linux-block: cdrom: update uniform CD-ROM maintainership in MAINTAINERS file
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4278b389218e..b43662a9a5f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19167,9 +19167,8 @@ W: http://dotat.at/prog/unifdef
F: scripts/unifdef.c
UNIFORM CDROM DRIVER
-M: Jens Axboe <axboe@kernel.dk>
+M: Phillip Potter <phil@philpotter.co.uk>
S: Maintained
-W: http://www.kernel.dk
F: Documentation/cdrom/
F: drivers/cdrom/cdrom.c
F: include/linux/cdrom.h