From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <jic23@cam•ac.uk>, Zhang Rui <rui.zhang@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alan Jenkins <alan-jenkins@tuffmail•co.uk>
Subject: linux-next: manual merge of the als tree with Linus' tree
Date: Thu, 18 Feb 2010 17:11:47 +1100 [thread overview]
Message-ID: <20100218171147.973d1016.sfr@canb.auug.org.au> (raw)
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@canb•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
next reply other threads:[~2010-02-18 6:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 6:11 Stephen Rothwell [this message]
2010-02-18 15:16 ` linux-next: manual merge of the als tree with Linus' tree Jonathan Cameron
2010-02-19 3:46 ` 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=20100218171147.973d1016.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan-jenkins@tuffmail$(echo .)co.uk \
--cc=jic23@cam$(echo .)ac.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
/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