The patch titled tty-switch-to-ktermios-and-new-framework-irda-fix has been removed from the -mm tree. Its filename was tty-switch-to-ktermios-and-new-framework-irda-fix.patch This patch was dropped because it was folded into tty-switch-to-ktermios-and-new-framework.patch ------------------------------------------------------ Subject: tty-switch-to-ktermios-and-new-framework-irda-fix From: Andrew Morton <akpm@xxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/net/irda/ircomm_tty.h | 2 +- net/irda/ircomm/ircomm_tty_ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN net/irda/ircomm/ircomm_tty.c~tty-switch-to-ktermios-and-new-framework-irda-fix net/irda/ircomm/ircomm_tty.c diff -puN net/irda/ircomm/ircomm_tty_ioctl.c~tty-switch-to-ktermios-and-new-framework-irda-fix net/irda/ircomm/ircomm_tty_ioctl.c --- a/net/irda/ircomm/ircomm_tty_ioctl.c~tty-switch-to-ktermios-and-new-framework-irda-fix +++ a/net/irda/ircomm/ircomm_tty_ioctl.c @@ -146,7 +146,7 @@ static void ircomm_tty_change_speed(stru * do something rational. */ void ircomm_tty_set_termios(struct tty_struct *tty, - struct termios *old_termios) + struct ktermios *old_termios) { struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; unsigned int cflag = tty->termios->c_cflag; diff -puN include/net/irda/ircomm_tty.h~tty-switch-to-ktermios-and-new-framework-irda-fix include/net/irda/ircomm_tty.h --- a/include/net/irda/ircomm_tty.h~tty-switch-to-ktermios-and-new-framework-irda-fix +++ a/include/net/irda/ircomm_tty.h @@ -126,7 +126,7 @@ extern int ircomm_tty_tiocmset(struct tt extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); extern void ircomm_tty_set_termios(struct tty_struct *tty, - struct termios *old_termios); + struct ktermios *old_termios); extern hashbin_t *ircomm_tty; #endif _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch node-aware-skb-allocation-fix-for-device-tree-changes.patch tty-signal-tty-locking.patch pktcdvd-bio-write-congestion-using-blk_congestion_wait.patch fsstack-introduce-fsstack_copy_attrinode_.patch add-process_session-helper-routine-deprecate-old-field.patch mxser-session-warning-fix.patch mxser-workqueue-fixes.patch tty-switch-to-ktermios-and-new-framework.patch tty-switch-to-ktermios-and-new-framework-irda-fix.patch tty-switch-to-ktermios-bluetooth-fix.patch tty_ioctl-use-termios-for-the-old-structure-and-termios2-fix.patch drivers-isdn-handcrafted-min-max-macro-removal-fix.patch fault-injection-capabilities-infrastructure-tidy.patch fault-injection-capabilities-infrastructure-tweaks.patch fault-injection-Kconfig-cleanup.patch fault-injection-stacktrace-filtering-kconfig-fix.patch sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-3.patch video-get-the-default-mode-from-the-right-database.patch various-fbdev-files-mark-structs-fix.patch backlight-lcd-remove-dependenct-from-the-framebuffer-layer-tidy.patch gxfb-fixups-for-the-amd-geode-gx-tidy.patch gxfb-support-flat-panel-timings-tidy.patch gxfb-support-command-line-options-tidy.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