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  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]
Date:	Fri, 5 Jun 2009 15:41:18 +1000
From:	Stephen Rothwell <>
To:	Greg KH <>
	Alan Stern <>,
	Alan Cox <>
Subject: linux-next: manual merge of the usb tree with the ttydev tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/kobil_sct.c between commit
d6ba273795c1260745197dc93f64c321c80a5ecc ("tty-usb-use-port") from the
ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
usb-serial: replace shutdown with disconnect, release") from the usb tree.

The latter removed the code (from kobil_shutdown) that the former
modified, so I just used the latter.
Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists