From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jean Delvare <jdelvare@suse•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kai Heng Feng <kai.heng.feng@canonical•com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: linux-next: manual merge of the dmi tree with Linus' tree
Date: Tue, 4 Sep 2018 09:19:50 +1000 [thread overview]
Message-ID: <20180904091950.2e49b1a5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
Hi all,
Today's linux-next merge of the dmi tree got a conflict in:
drivers/acpi/bus.c
between commit:
ae976358cd7b ("Revert "ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530"")
from Linus' tree and commit:
767b174cad46 ("ACPI / bus: Only call dmi_check_system on X86")
from the dmi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/acpi/bus.c
index 292088fcc624,0ac3ad75309c..000000000000
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@@ -1033,11 -1056,15 +1029,16 @@@ void __init acpi_early_init(void
acpi_permanent_mmap = true;
+ #ifdef CONFIG_X86
/*
- * Check machine-specific quirks
+ * If the machine falls into the DMI check table,
+ * DSDT will be copied to memory
+ * Note that calling dmi_check_system here on other architectures
+ * would not be OK because only x86 intializes dmi early enough.
+ * Thankfully only x86 systems need such quirks for now.
*/
- dmi_check_system(acpi_quirks_dmi_table);
+ dmi_check_system(dsdt_dmi_table);
+ #endif
status = acpi_reallocate_root_table();
if (ACPI_FAILURE(status)) {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-09-03 23:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 23:19 Stephen Rothwell [this message]
2018-09-04 12:51 ` linux-next: manual merge of the dmi tree with Linus' tree Jean Delvare
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=20180904091950.2e49b1a5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jdelvare@suse$(echo .)de \
--cc=kai.heng.feng@canonical$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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