linux-next: manual merge of the dmi tree with Linus' tree

[Stephen Rothwell]

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: pgp9BvlCBWhGR.pgp
Description: OpenPGP digital signature