diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 10:09:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 10:09:14 -0700 |
| commit | 737f1cd8a8e80fe3243662f04d4d66829facc71a (patch) | |
| tree | 74eb9c4f1bce37b1b5315a7139f364854d467dfb /include/linux | |
| parent | fcaec17b3657a4f8b0b131d5c1ab87e255c3dee6 (diff) | |
| parent | bbc3925cf696422492ebdaba386e61450fa2294c (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/cdrom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index c4fef00abdf3..0a89f111e00e 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -64,6 +64,7 @@ struct cdrom_device_info { int for_data; int (*exit)(struct cdrom_device_info *); int mrw_mode_page; + __s64 last_media_change_ms; }; struct cdrom_device_ops { |