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>,
Brian Swetland <swetland@google.com>,
"Mike A. Chan" <mikechan@google.com>,
Sheng Yang <sheng@linux.intel.com>,
Yunhong Jiang <yunhong.jiang@intel.com>,
Xiaohui Xin <xiaohui.xin@intel.com>,
Jun Nakajima <jun.nakajima@intel.com>,
Bruce Beare <bruce.j.beare@intel.com>,
Tom Keel <thomas.keel@intel.com>, Alan Cox <alan@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: Re: linux-next: manual merge of the tty tree with the input tree
Date: Mon, 28 Jan 2013 06:46:15 -0800 [thread overview]
Message-ID: <20130128144615.GC2997@kroah.com> (raw)
In-Reply-To: <20130128204424.a3eedfee954ba6cc7a620652@canb.auug.org.au>
On Mon, Jan 28, 2013 at 08:44:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/input/keyboard/Kconfig between commit 6f2ac009f29b ("Input:
> goldfish - virtual input event driver") from the input tree and commit
> 4f73bc4dd3e8 ("tty: Added a CONFIG_TTY option to allow removal of TTY")
> from the tty tree.
>
> I fixed it up (see below - I am not sure if GOLDFISH_EVENTS needs TTY or
> not) and can carry the fix as necessary (no action is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/input/keyboard/Kconfig
> index 078305e,008f96a..0000000
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@@ -479,16 -482,8 +482,18 @@@ config KEYBOARD_SAMSUN
> To compile this driver as a module, choose M here: the
> module will be called samsung-keypad.
>
> + if TTY
> +
> +config KEYBOARD_GOLDFISH_EVENTS
> + depends on GOLDFISH
> + tristate "Generic Input Event device for Goldfish"
> + help
> + Say Y here to get an input event device for the Goldfish virtual
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2013-01-28 14:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 9:44 linux-next: manual merge of the tty tree with the input tree Stephen Rothwell
2013-01-28 14:46 ` Greg KH [this message]
2013-01-28 17:33 ` Dmitry Torokhov
2013-01-28 22:09 ` Joe Millenbach
2013-01-28 22:44 ` Dmitry Torokhov
2013-01-28 23:59 ` Josh Triplett
2013-01-29 0:23 ` Dmitry Torokhov
2013-01-29 5:13 ` Josh Triplett
2013-01-29 5:33 ` Dmitry Torokhov
2013-01-29 6:26 ` Joe Millenbach
2013-01-29 6:38 ` Dmitry Torokhov
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=20130128144615.GC2997@kroah.com \
--to=greg@kroah.com \
--cc=alan@linux.intel.com \
--cc=bruce.j.beare@intel.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jmillenbach@gmail.com \
--cc=jun.nakajima@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mikechan@google.com \
--cc=sfr@canb.auug.org.au \
--cc=sheng@linux.intel.com \
--cc=swetland@google.com \
--cc=thomas.keel@intel.com \
--cc=xiaohui.xin@intel.com \
--cc=yunhong.jiang@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.