linux-kernel - linux-next: manual merge of the als 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100218171147.973d1016.sfr@canb.auug.org.au>
Date:	Thu, 18 Feb 2010 17:11:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jonathan Cameron <jic23@....ac.uk>, Zhang Rui <rui.zhang@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alan Jenkins <alan-jenkins@...fmail.co.uk>
Subject: linux-next: manual merge of the als tree with Linus' tree

Hi all,

Today's linux-next merge of the als tree got a conflict in drivers/misc/Kconfig between commit 8c5d30e590593495c5bb8bd4a2519ce1ac909a22 ("dell-laptop: remove duplicate Kconfig entry under drivers/misc") from Linus' tree and commit 6600f58cfc348ef5862876ab4965d95aad793429 ("isl29003: Move from misc to als now it available with minimal changes") from the als tree.

Just context changes.  I fixed it up (see below) and can carry the change
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/misc/Kconfig
index 9eaa647,e5ffa20..0000000
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -278,16 -210,19 +278,6 @@@ config SGI_GRU_DEBU
  	This option enables addition debugging code for the SGI GRU driver. If
  	you are unsure, say N.
  
- config ISL29003
- 	tristate "Intersil ISL29003 ambient light sensor"
- 	depends on I2C && SYSFS
- 	help
- 	  If you say yes here you get support for the Intersil ISL29003
- 	  ambient light sensor.
- 
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called isl29003.
- 
 -config DELL_LAPTOP
 -	tristate "Dell Laptop Extras (EXPERIMENTAL)"
 -	depends on X86
 -	depends on DCDBAS
 -	depends on EXPERIMENTAL
 -	depends on BACKLIGHT_CLASS_DEVICE
 -	depends on RFKILL
 -	depends on POWER_SUPPLY
 -	default n
 -	---help---
 -	This driver adds support for rfkill and backlight control to Dell
 -	laptops.
 -
  config EP93XX_PWM
  	tristate "EP93xx PWM support"
  	depends on ARCH_EP93XX
--
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/