From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthew Garrett <mjg59@srcf•ucam.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jonathan Corbet <corbet@lwn•net>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Wed, 25 Aug 2010 11:22:36 +1000 [thread overview]
Message-ID: <20100825112236.6ec0390e.sfr@canb.auug.org.au> (raw)
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@canb•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
next reply other threads:[~2010-08-25 1:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 1:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-24 2:48 linux-next: manual merge of the drivers-x86 tree with Linus' tree Stephen Rothwell
2011-03-24 2:52 ` Matthew Garrett
2011-04-08 5:26 Stephen Rothwell
2012-05-31 2:06 Stephen Rothwell
2015-06-02 6:07 Stephen Rothwell
2015-06-03 3:27 ` Darren Hart
2015-06-03 4:04 ` Stephen Rothwell
2016-01-15 1:56 Stephen Rothwell
2018-10-29 3:29 Stephen Rothwell
2018-10-29 9:34 ` Andy Shevchenko
2024-01-02 2:30 Stephen Rothwell
2024-02-08 1:57 Stephen Rothwell
2024-03-01 3:14 Stephen Rothwell
2024-03-08 2:19 Stephen Rothwell
2024-03-08 2:34 Stephen Rothwell
2024-08-26 3:44 Stephen Rothwell
2025-01-14 3:32 Stephen Rothwell
2025-01-14 3:42 ` Kurt Borja
2025-05-09 6:24 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=20100825112236.6ec0390e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mjg59@srcf$(echo .)ucam.org \
/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