From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Darren Hart <dvhart@infradead•org>,
Philippe Coval <philippe.coval@open•eurogiciel.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dmitry Tunin <hanipouspilot@gmail•com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Tue, 2 Jun 2015 16:07:23 +1000 [thread overview]
Message-ID: <20150602160723.3b519d63@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
("ideapad_laptop: Add Lenovo G40-30 to devices without radio switch")
from Linus' tree and commit 4fa9dabcffc8 ("ideapad_laptop: Lenovo
G50-30 fix rfkill reports wireless blocked") from the drivers-x86 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/platform/x86/ideapad-laptop.c
index b496db87bc05,1db3d2176d56..000000000000
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@@ -830,13 -830,13 +830,20 @@@ static void ideapad_acpi_notify(acpi_ha
*/
static const struct dmi_system_id no_hw_rfkill_list[] = {
{
+ .ident = "Lenovo G40-30",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
+ },
+ },
+ {
+ .ident = "Lenovo G50-30",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G50-30"),
+ },
+ },
+ {
.ident = "Lenovo Yoga 2 11 / 13 / Pro",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-02 6:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 6:07 Stephen Rothwell [this message]
2015-06-03 3:27 ` linux-next: manual merge of the drivers-x86 tree with Linus' tree Darren Hart
2015-06-03 4:04 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 6:24 Stephen Rothwell
2025-01-14 3:32 Stephen Rothwell
2025-01-14 3:42 ` Kurt Borja
2024-08-26 3:44 Stephen Rothwell
2024-03-08 2:34 Stephen Rothwell
2024-03-08 2:19 Stephen Rothwell
2024-03-01 3:14 Stephen Rothwell
2024-02-08 1:57 Stephen Rothwell
2024-01-02 2:30 Stephen Rothwell
2018-10-29 3:29 Stephen Rothwell
2018-10-29 9:34 ` Andy Shevchenko
2016-01-15 1:56 Stephen Rothwell
2012-05-31 2:06 Stephen Rothwell
2011-04-08 5:26 Stephen Rothwell
2011-03-24 2:48 Stephen Rothwell
2011-03-24 2:52 ` Matthew Garrett
2010-08-25 1:22 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=20150602160723.3b519d63@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dvhart@infradead$(echo .)org \
--cc=hanipouspilot@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philippe.coval@open$(echo .)eurogiciel.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