From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Darren Hart <dvhart@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Hans de Goede" <hdegoede@redhat•com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>,
"Pali Rohár" <pali.rohar@gmail•com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Fri, 15 Jan 2016 12:56:11 +1100 [thread overview]
Message-ID: <20160115125611.56364f00@canb.auug.org.au> (raw)
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/dell-wmi.c
between commit:
61679c725553 ("dell-wmi: Use acpi_video_handles_brightness_key_presses()")
from Linus' tree and commit:
6129570931b8 ("dell-wmi: Check if Dell WMI descriptor structure is valid")
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/dell-wmi.c
index cb8a9c2a3a1f,5db9efbde5b9..000000000000
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@@ -42,8 -44,13 +44,12 @@@ MODULE_DESCRIPTION("Dell laptop WMI hot
MODULE_LICENSE("GPL");
#define DELL_EVENT_GUID "9DBB5994-A997-11DA-B012-B622A1EF5492"
+ #define DELL_DESCRIPTOR_GUID "8D9DDCBC-A997-11DA-B012-B622A1EF5492"
+
-static int acpi_video;
+ static u32 dell_wmi_interface_version;
MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
+ MODULE_ALIAS("wmi:"DELL_DESCRIPTOR_GUID);
/*
* Certain keys are flagged as KE_IGNORE. All of these are either
@@@ -396,7 -520,12 +520,11 @@@ static int __init dell_wmi_init(void
return -ENODEV;
}
+ err = dell_wmi_check_descriptor_buffer();
+ if (err)
+ return err;
+
dmi_walk(find_hk_type, NULL);
- acpi_video = acpi_video_get_backlight_type() != acpi_backlight_vendor;
err = dell_wmi_input_setup();
if (err)
next reply other threads:[~2016-01-15 1:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 1:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 6:24 linux-next: manual merge of the drivers-x86 tree with Linus' tree 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
2015-06-02 6:07 Stephen Rothwell
2015-06-03 3:27 ` Darren Hart
2015-06-03 4:04 ` 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=20160115125611.56364f00@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dvhart@infradead$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pali.rohar@gmail$(echo .)com \
--cc=rafael.j.wysocki@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