linux-kernel - linux-next: manual merge of the drivers-x86 tree with Linus' 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>] [day] [month] [year] [list]

Message-Id: <20100825112236.6ec0390e.sfr@canb.auug.org.au>
Date:	Wed, 25 Aug 2010 11:22:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Matthew Garrett <mjg59@...f.ucam.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonathan Corbet <corbet@....net>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree

Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/Kconfig between commit
c76a3e1d6c52c5cc1371f1abc7381c5715ebdf7f ("ACPI_TOSHIBA needs LEDS
support") from Lunus' tree and commit
35989e9d7e19deb4b395aee7d120b1536337b4af ("toshiba-acpi - switch to using
sparse keymap") from the drivers-x86 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/platform/x86/Kconfig
index cff7cc2,8498389..0000000
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -486,12 -490,10 +490,12 @@@ config TOPSTAR_LAPTO
  config ACPI_TOSHIBA
  	tristate "Toshiba Laptop Extras"
  	depends on ACPI
 +	depends on LEDS_CLASS
 +	depends on NEW_LEDS
 +	depends on BACKLIGHT_CLASS_DEVICE
  	depends on INPUT
  	depends on RFKILL || RFKILL = n
- 	select INPUT_POLLDEV
+ 	select INPUT_SPARSEKMAP
 -	select BACKLIGHT_CLASS_DEVICE
  	---help---
  	  This driver adds support for access to certain system settings
  	  on "legacy free" Toshiba laptops.  These laptops can be recognized by
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/