linux-next: manual merge of the usb tree with the tty tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_ti.c between commit adc8d746caa6 ("tty: move the
termios object into the tty") from the tty tree and commit 67e6da702753
("USB: serial: io_ti.c: remove dbg() usage") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/serial/io_ti.c
index 765978a,54916d7..0000000
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@@ -2272,9 -2224,8 +2224,8 @@@ static void change_port_settings(struc
  
  	config = kmalloc (sizeof (*config), GFP_KERNEL);
  	if (!config) {
 -		*tty->termios = *old_termios;
 +		tty->termios = *old_termios;
- 		dev_err(&edge_port->port->dev, "%s - out of memory\n",
- 								__func__);
+ 		dev_err(dev, "%s - out of memory\n", __func__);
  		return;
  	}
  
@@@ -2357,12 -2308,12 +2308,12 @@@
  	/* if we are implementing OUTBOUND XON/XOFF */
  	if (I_IXON(tty)) {
  		config->wFlags |= UMP_MASK_UART_FLAGS_OUT_X;
- 		dbg("%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x",
- 		     __func__, config->cXon, config->cXoff);
+ 		dev_dbg(dev, "%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x\n",
+ 			__func__, config->cXon, config->cXoff);
  	} else
- 		dbg("%s - OUTBOUND XON/XOFF is disabled", __func__);
+ 		dev_dbg(dev, "%s - OUTBOUND XON/XOFF is disabled\n", __func__);
  
 -	tty->termios->c_cflag &= ~CMSPAR;
 +	tty->termios.c_cflag &= ~CMSPAR;
  
  	/* Round the baud rate */
  	baud = tty_get_baud_rate(tty);
@@@ -2408,13 -2358,13 +2358,13 @@@ static void edge_set_termios(struct tty
  	struct edgeport_port *edge_port = usb_get_serial_port_data(port);
  	unsigned int cflag;
  
 -	cflag = tty->termios->c_cflag;
 +	cflag = tty->termios.c_cflag;
  
- 	dbg("%s - clfag %08x iflag %08x", __func__,
- 	    tty->termios.c_cflag, tty->termios.c_iflag);
- 	dbg("%s - old clfag %08x old iflag %08x", __func__,
- 	    old_termios->c_cflag, old_termios->c_iflag);
- 	dbg("%s - port %d", __func__, port->number);
+ 	dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,
 -		tty->termios->c_cflag, tty->termios->c_iflag);
++		tty->termios.c_cflag, tty->termios.c_iflag);
+ 	dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,
+ 		old_termios->c_cflag, old_termios->c_iflag);
+ 	dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
  
  	if (edge_port == NULL)
  		return;

Attachment: pgp00000.pgp
Description: PGP signature