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: <20130326144932.aae6ea8285bba0a98b0b6193@canb.auug.org.au>
Date:	Tue, 26 Mar 2013 14:49:32 +1100
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,
	Jiri Slaby <jslaby@...e.cz>, Johan Hovold <jhovold@...il.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/usb-serial.c between commit 6aad04f21374 ("TTY: add
tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484
("USB: serial: clean up debug info") from the usb tree.

I fixed it up (I just used the version of usb_serial_port_work() from the
tty tree - 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/usb-serial.c
index 2f60474,5eb96df..0000000
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@@ -542,11 -538,19 +538,11 @@@ static void usb_serial_port_work(struc
  {
  	struct usb_serial_port *port =
  		container_of(work, struct usb_serial_port, work);
 -	struct tty_struct *tty;
  
 -	tty = tty_port_tty_get(&port->port);
 -	if (!tty)
 -		return;
 -
 -	dev_dbg(tty->dev, "%s\n", __func__);
 -
 -	tty_wakeup(tty);
 -	tty_kref_put(tty);
 +	tty_port_tty_wakeup(&port->port);
  }
  
- static void kill_traffic(struct usb_serial_port *port)
+ static void usb_serial_port_poison_urbs(struct usb_serial_port *port)
  {
  	int i;
  

Content of type "application/pgp-signature" skipped