Merge 4.2-rc4 into tty-next

Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.

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

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/etraxfs-uart.c
Simple merge

diff --cc drivers/tty/serial/imx.c
index 83b02d4,54fdc78..e705149
--- 1/drivers/tty/serial/imx.c
--- 2/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@@ -1139,14 -1121,16 +1139,9 @@@ static int imx_startup(struct uart_por
  
        writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
  
-       /* Can we enable the DMA support? */
-       if (is_imx6q_uart(sport) && !uart_console(port) &&
-           !sport->dma_is_inited)
-               imx_uart_dma_init(sport);
- 
        spin_lock_irqsave(&sport->port.lock, flags);
        /* Reset fifo's and state machines */
 -      i = 100;
 -
 -      temp = readl(sport->port.membase + UCR2);
 -      temp &= ~UCR2_SRST;
 -      writel(temp, sport->port.membase + UCR2);
 -
 -      while (!(readl(sport->port.membase + UCR2) & UCR2_SRST) && (--i > 0))
 -              udelay(1);
 +      imx_reset(sport);
  
        /*
         * Finally, clear and enable interrupts

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