The patch titled oti6858: Remove broken ioctl code in -mm tree and also the broken fixes has been removed from the -mm tree. Its filename was fix-gregkh-usb-usb-serial-fix-oti6858c-segfault-in-termios-handling.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: oti6858: Remove broken ioctl code in -mm tree and also the broken fixes From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> This stuff is simply not needed. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: Thomas Viehmann <tv@xxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/usb/serial/oti6858.c | 15 --------------- 1 files changed, 15 deletions(-) diff -puN drivers/usb/serial/oti6858.c~fix-gregkh-usb-usb-serial-fix-oti6858c-segfault-in-termios-handling drivers/usb/serial/oti6858.c --- a/drivers/usb/serial/oti6858.c~fix-gregkh-usb-usb-serial-fix-oti6858c-segfault-in-termios-handling +++ a/drivers/usb/serial/oti6858.c @@ -817,21 +817,6 @@ static int oti6858_ioctl(struct usb_seri __FUNCTION__, port->number, cmd, arg); switch (cmd) { - case TCGETS: - if (kernel_termios_to_user_termios((struct ktermios __user *)arg, - port->tty->termios)) - return -EFAULT; - return 0; - - case TCSETS: - case TCSETSW: /* FIXME: this is not the same! */ - case TCSETSF: /* FIXME: this is not the same! */ - if (user_termios_to_kernel_termios(port->tty->termios, - (struct ktermios __user *)arg)) - return -EFAULT; - oti6858_set_termios(port, NULL); - return 0; - case TCFLSH: /* FIXME */ return 0; _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are git-libata-all.patch pata_acpi-rework-the-acpi-drivers-based-upon-experience.patch libata-switch-most-of-the-remaining-sff-drivers-to.patch pata_marvell-add-more-identifiers.patch libata-portmap-remove-unused-definitions.patch libata-correct-handling-of-srst-reset-sequences.patch libata-spot-bridge-chips.patch libata-allow-for-original-ide-drives-that-dont-support-geometry-setting.patch libata-strict-checking-for-identify-reporting.patch libata-add-a-drivers-ide-style-dma-disable.patch ata-pata_marvell-use-ioread-for-iomap-ped-memory.patch st340823a-hpa-and-libata.patch libata-fix-hopefully-all-the-remaining-problems-with.patch tty-add-the-new-ioctls-and-definitionto-the-mips.patch serial_txx9-cleanup-includes.patch serial-keep-the-dtr-setting-for-serial-console.patch 8250_pci-autodetect-mainpine-cards.patch fix-ide-legacy-mode-resources.patch fix-ide-legacy-mode-resources-fix.patch git-scsi-misc.patch geode-mfgpt-support-for-geode-class-machines.patch geode-mfgpt-clock-event-device-support.patch git-xtensa.patch security-convert-lsm-into-a-static-interface-vs-fix-null-pointer-dereference-in-__vm_enough_memory.patch blackfin-enable-arbitary-speed-serial-setting.patch mxser-remove-use-of-dead-tty_flipbuf_size-definition.patch jsm-remove-further-unneeded-crud.patch ttyh-remove-dead-define.patch codingstyle-relax-the-80-cole-rule.patch sysctl-remove-broken-cdrom-binary-sysctls.patch mxser-remove-commented-crap.patch char-cyclades-remove-bottom-half-processing.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