From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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: Re: linux-next: manual merge of the usb tree with the tty tree
Date: Mon, 28 Jan 2013 06:45:54 -0800 [thread overview]
Message-ID: <20130128144554.GB2997@kroah.com> (raw)
In-Reply-To: <20130128211307.a235b6793587fea5e1fc5074@canb.auug.org.au>
On Mon, Jan 28, 2013 at 09:13:07PM +1100, Stephen Rothwell wrote:
> 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
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2013-01-28 14:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 10:13 linux-next: manual merge of the usb tree with the tty tree Stephen Rothwell
2013-01-28 14:45 ` Greg KH [this message]
-- 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=20130128144554.GB2997@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=balbi@ti$(echo .)com \
--cc=bigeasy@linutronix$(echo .)de \
--cc=jmillenbach@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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