From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Millenbach <jmillenbach@gmail.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Felipe Balbi <balbi@ti.com>
Subject: linux-next: manual merge of the usb tree with the tty tree
Date: Mon, 28 Jan 2013 21:13:07 +1100 [thread overview]
Message-ID: <20130128211307.a235b6793587fea5e1fc5074@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
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@canb.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.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-01-28 10:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 10:13 Stephen Rothwell [this message]
2013-01-28 14:45 ` linux-next: manual merge of the usb tree with the tty tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-03-26 3:49 Stephen Rothwell
2013-03-26 21:29 ` Greg KH
2012-09-19 4:16 Stephen Rothwell
2012-09-19 7:17 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:30 Stephen Rothwell
2012-09-17 7:30 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130128211307.a235b6793587fea5e1fc5074@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=bigeasy@linutronix.de \
--cc=greg@kroah.com \
--cc=jmillenbach@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).