diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 18:09:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 18:09:14 +0100 |
commit | 737f1cd8a8e80fe3243662f04d4d66829facc71a (patch) | |
tree | 74eb9c4f1bce37b1b5315a7139f364854d467dfb /fs/nfsd | |
parent | Merge tag 'for-5.16/scsi-ma-2021-10-29' of git://git.kernel.dk/linux-block (diff) | |
parent | cdrom: Remove redundant variable and its assignment (diff) | |
download | linux-737f1cd8a8e80fe3243662f04d4d66829facc71a.tar.xz linux-737f1cd8a8e80fe3243662f04d4d66829facc71a.zip |
Merge tag 'for-5.16/cdrom-2021-10-29' of git://git.kernel.dk/linux-block
Pull CDROM updates from Jens Axboe:
"On behalf of Phillip, here are the CDROM updates for the 5.16-rc1
merge window:
- Add ioctl for improved media change detection (Lukas)
- Reformat some documentation (Phillip)
- Redundant variable removal (luo)"
* tag 'for-5.16/cdrom-2021-10-29' of git://git.kernel.dk/linux-block:
cdrom: Remove redundant variable and its assignment
cdrom: docs: reformat table in Documentation/userspace-api/ioctl/cdrom.rst
drivers/cdrom: improved ioctl for media change detection
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions