Merge 3.12-rc3 into tty-next

We want the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/n_tty.c
index 2ba7bf86d0968cbfffa8dd6b7a7d556355d9e009,01bf5eb4f2384a66999157ddd855162c8e966f7a..09505ff4fb25b362d38155addce7d601313be591
--- 1/drivers/tty/n_tty.c
--- 2/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@@ -1752,11 -1752,13 +1752,10 @@@ int is_ignored(int sig
  static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
  {
        struct n_tty_data *ldata = tty->disc_data;
 -      int canon_change = 1;
  
 -      if (old)
 -              canon_change = (old->c_lflag ^ tty->termios.c_lflag) & ICANON;
 -      if (canon_change) {
 +      if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) {
                bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
-               ldata->line_start = 0;
-               ldata->canon_head = ldata->read_tail;
+               ldata->line_start = ldata->canon_head = ldata->read_tail;
                ldata->erasing = 0;
                ldata->lnext = 0;
        }

diff --cc drivers/tty/serial/pch_uart.c
Simple merge