linux-next: manual merge of the tty tree with the tty.current tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/serial/imx.c

between commit:

  9706fc87b4cf ("serial: imx: only set receiver level if it is zero")

from the tty.current tree and commit:

  3093f180bc6e ("serial: imx: stop casting struct uart_port to struct imx_port")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/tty/serial/imx.c
index ff32cd2d2863,d96f0524f7fb..000000000000
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@@ -1549,10 -1553,9 +1554,10 @@@ static int imx_uart_startup(struct uart
  
  static void imx_uart_shutdown(struct uart_port *port)
  {
- 	struct imx_port *sport = (struct imx_port *)port;
+ 	struct imx_port *sport = to_imx_port(port);
  	unsigned long flags;
  	u32 ucr1, ucr2, ucr4, uts;
 +	int loops;
  
  	if (sport->dma_is_enabled) {
  		dmaengine_terminate_sync(sport->dma_chan_tx);
@@@ -1984,8 -1937,8 +1989,8 @@@ static void imx_uart_poll_put_char(stru
  static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termios,
  				 struct serial_rs485 *rs485conf)
  {
- 	struct imx_port *sport = (struct imx_port *)port;
+ 	struct imx_port *sport = to_imx_port(port);
 -	u32 ucr2;
 +	u32 ucr2, ufcr;
  
  	if (rs485conf->flags & SER_RS485_ENABLED) {
  		/* Enable receiver if low-active RTS signal is requested */

Attachment: pgpLwrwsYtY5v.pgp
Description: OpenPGP digital signature