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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120917173103.9805531382847454e2d59bb8@canb.auug.org.au>
Date:	Mon, 17 Sep 2012 17:31:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alan Cox <alan@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the tty tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/digi_acceleport.c between commit adc8d746caa6 ("tty:
move the termios object into the tty") from the tty tree and commit
f9dfbebb8b39 ("USB: serial: digi_acceleport.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@...b.auug.org.au

diff --cc drivers/usb/serial/digi_acceleport.c
index afd9d2e,d3a8941..0000000
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@@ -687,8 -685,9 +685,9 @@@ static void digi_set_termios(struct tty
  		struct usb_serial_port *port, struct ktermios *old_termios)
  {
  	struct digi_port *priv = usb_get_serial_port_data(port);
+ 	struct device *dev = &port->dev;
 -	unsigned int iflag = tty->termios->c_iflag;
 -	unsigned int cflag = tty->termios->c_cflag;
 +	unsigned int iflag = tty->termios.c_iflag;
 +	unsigned int cflag = tty->termios.c_cflag;
  	unsigned int old_iflag = old_termios->c_iflag;
  	unsigned int old_cflag = old_termios->c_cflag;
  	unsigned char buf[32];

Content of type "application/pgp-signature" skipped