The patch titled tty-switch-to-ktermios sclp fix has been removed from the -mm tree. Its filename was tty-switch-to-ktermios-sclp-fix.patch This patch was dropped because it was folded into tty-switch-to-ktermios.patch ------------------------------------------------------ Subject: tty-switch-to-ktermios sclp fix From: Martin Peschke <mp3@xxxxxxxxxx> Extern declaration of tty_std_termios in sclp_tty was a hack which is obsolete. CC drivers/s390/char/sclp_tty.o drivers/s390/char/sclp_tty.c:63: error: conflicting types for 'tty_std_termios' include/linux/tty.h:261: error: previous declaration of 'tty_std_termios' was here drivers/s390/char/sclp_tty.c: In function 'sclp_tty_init': drivers/s390/char/sclp_tty.c:790: error: incompatible types in assignment make[2]: *** [drivers/s390/char/sclp_tty.o] Error 1 make[1]: *** [drivers/s390/char] Error 2 make: *** [drivers/s390] Error 2 Kernel compilation...FAILED Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx> Acked-by: Peter Oberparleiter <oberpar@xxxxxxxxxx> Acked-by: Alan Cox <alan@xxxxxxxxxx> Cc: Cornelia Huck <cornelia.huck@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/s390/char/sclp_tty.c | 2 -- 1 files changed, 2 deletions(-) diff -puN drivers/s390/char/sclp_tty.c~tty-switch-to-ktermios-sclp-fix drivers/s390/char/sclp_tty.c --- a/drivers/s390/char/sclp_tty.c~tty-switch-to-ktermios-sclp-fix +++ a/drivers/s390/char/sclp_tty.c @@ -60,8 +60,6 @@ static unsigned short int sclp_tty_chars struct tty_driver *sclp_tty_driver; -extern struct termios tty_std_termios; - static struct sclp_ioctls sclp_ioctls; static struct sclp_ioctls sclp_ioctls_init = { _ Patches currently in -mm which might be from mp3@xxxxxxxxxx are tty-switch-to-ktermios.patch tty-switch-to-ktermios-sclp-fix.patch tty-switch-to-ktermios-3270-fix.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