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

[Stephen Rothwell]

Hi all,

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

  drivers/usb/serial/ftdi_sio.c

between commit:

  a8619505a778 ("USB: serial: ftdi_sio: move driver structure")

from the usb-serial tree and commit:

  f6d47fe5921a ("usb: serial: Make ->set_termios() old ktermios const")

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/usb/serial/ftdi_sio.c
index 31b9b36f3a1c,0a1da579ead5..000000000000
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -1107,8 -1078,29 +1107,9 @@@ static const char *ftdi_chip_name[] = 
  #define FTDI_STATUS_B1_MASK	(FTDI_RS_BI)
  /* End TIOCMIWAIT */
  
 -/* function prototypes for a FTDI serial converter */
 -static int  ftdi_sio_probe(struct usb_serial *serial,
 -					const struct usb_device_id *id);
 -static int  ftdi_sio_port_probe(struct usb_serial_port *port);
 -static void ftdi_sio_port_remove(struct usb_serial_port *port);
 -static int  ftdi_open(struct tty_struct *tty, struct usb_serial_port *port);
 -static void ftdi_dtr_rts(struct usb_serial_port *port, int on);
 -static void ftdi_process_read_urb(struct urb *urb);
 -static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
 -						void *dest, size_t size);
  static void ftdi_set_termios(struct tty_struct *tty,
- 			struct usb_serial_port *port, struct ktermios *old);
+ 			     struct usb_serial_port *port,
+ 			     const struct ktermios *old_termios);
 -static int  ftdi_tiocmget(struct tty_struct *tty);
 -static int  ftdi_tiocmset(struct tty_struct *tty,
 -			unsigned int set, unsigned int clear);
 -static int  ftdi_ioctl(struct tty_struct *tty,
 -			unsigned int cmd, unsigned long arg);
 -static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss);
 -static int set_serial_info(struct tty_struct *tty,
 -				struct serial_struct *ss);
 -static void ftdi_break_ctl(struct tty_struct *tty, int break_state);
 -static bool ftdi_tx_empty(struct usb_serial_port *port);
  static int ftdi_get_modem_status(struct usb_serial_port *port,
  						unsigned char status[2]);

Attachment: pgpexD5OuDB1O.pgp
Description: OpenPGP digital signature