linux-kernel - linux-next: manual merge of the tty tree with the input 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: <20130128204424.a3eedfee954ba6cc7a620652@canb.auug.org.au>
Date:	Mon, 28 Jan 2013 20:44:24 +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>,
	Brian Swetland <swetland@...gle.com>,
	"Mike A. Chan" <mikechan@...gle.com>,
	Sheng Yang <sheng@...ux.intel.com>,
	Yunhong Jiang <yunhong.jiang@...el.com>,
	Xiaohui Xin <xiaohui.xin@...el.com>,
	Jun Nakajima <jun.nakajima@...el.com>,
	Bruce Beare <bruce.j.beare@...el.com>,
	Tom Keel <thomas.keel@...el.com>,
	Alan Cox <alan@...ux.intel.com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: linux-next: manual merge of the tty tree with the input tree

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@...b.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
 +	  device emulator.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called goldfish-events.
 +
  config KEYBOARD_STOWAWAY
  	tristate "Stowaway keyboard"
  	select SERIO

Content of type "application/pgp-signature" skipped