Commit 03085b3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents eebb4159 55d1308b

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -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