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: <20130128211307.a235b6793587fea5e1fc5074@canb.auug.org.au>
Date:	Mon, 28 Jan 2013 21:13:07 +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,
	Joe Millenbach <jmillenbach@...il.com>,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
	Felipe Balbi <balbi@...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/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a
CONFIG_TTY option to allow removal of TTY") from the tty tree and commit
3249ca22c088 ("usb: gadget: u_serial: convert into a module") 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/gadget/Kconfig
index a1bd951,6665d25..0000000
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -750,7 -760,8 +760,9 @@@ config USB_GADGET_TARGE
  
  config USB_G_SERIAL
  	tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
 +	depends on TTY
+ 	select USB_U_SERIAL
+ 	select USB_F_ACM
  	select USB_LIBCOMPOSITE
  	help
  	  The Serial Gadget talks to the Linux-USB generic serial driver.

Content of type "application/pgp-signature" skipped