The patch titled optical /proc/ide/*/media has been removed from the -mm tree. Its filename is optical-proc-ide-media.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: optical /proc/ide/*/media From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Sergey Vlasov reported that his "FUJITSU MCC3064AP, ATAPI OPTICAL drive" pops up as UNKNOWN in /proc/ide/*/media . Closes #4145. Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ide/ide-proc.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/ide/ide-proc.c~optical-proc-ide-media drivers/ide/ide-proc.c --- a/drivers/ide/ide-proc.c~optical-proc-ide-media +++ a/drivers/ide/ide-proc.c @@ -376,6 +376,8 @@ static int proc_ide_read_media break; case ide_floppy:media = "floppy\n"; break; + case ide_optical:media = "optical\n"; + break; default: media = "UNKNOWN\n"; break; } _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch headers_check-improve-include-regexp.patch headers_check-clarify-error-message.patch asus_acpi-fix-proc-files-parsing.patch asus_acpi-dont-printk-on-writing-garbage-to-proc-files.patch git-alsa.patch git-agpgart.patch git-dvb.patch config_pm=n-slim-drivers-ieee1394-ohci1394c.patch git-libata-all.patch git-net.patch config_pm=n-slim-drivers-pcmcia.patch i82092-wire-up-errors-from-pci_register_driver.patch config_pm=n-slim-drivers-serial-8250_pcic.patch megaraid-fix-warnings-when-config_proc_fs=n.patch git-xfs.patch task_struct-ifdef-missedem-v-ipc.patch ifdef-blktrace-debugging-fields.patch tty_ioc-keep-davej-sane.patch ifdef-quota_read-quota_write.patch reiserfs-ifdef-xattr_sem.patch reiserfs-ifdef-acl-stuff-from-inode.patch fsh-ifdef-security-fields.patch config_pm=n-slim-drivers-parport-parport_serialc.patch config_pm=n-slim-sound-oss-tridentc.patch config_pm=n-slim-sound-oss-cs46xxc.patch windfarm_smu_satc-simplify-around-i2c_add_driver.patch cramfs-rewrite-init_cramfs_fs.patch freevxfs-fix-leak-on-error-path.patch cramfs-make-cramfs_uncompress_exit-return-void.patch 9p-fix-leak-on-error-path.patch ban-register_filesystemnull.patch jbd-use-build_bug_on-in-journal-init.patch really-ignore-kmem_cache_destroy-return-value.patch make-kmem_cache_destroy-return-void.patch documentation-submittingdrivers-minor-update.patch kmemdup-introduce.patch kmemdup-some-users.patch create-fs-utimesc.patch remove-null-check-in-register_nls.patch make-kmem_cache_destroy-return-void-ecryptfs.patch config_pm=n-slim-drivers-ide-pci-sc1200c.patch documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch ioctl-messtxt-xfs-typos.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html