From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 16 May 2016 14:45:25 +0000 (+0200)
Subject: Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'
X-Git-Tag: v4.14-rc1~3261^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc499f9807bfc179c66b7c3524e30370c6fd1b1;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'

* acpi-numa:
  ACPI / SRAT: fix SRAT parsing order with both LAPIC and X2APIC present

* acpi-tables:
  ACPI / tables: Fix DSDT override mechanism
  ACPI / tables: Convert initrd table override to table upgrade mechanism
  ACPI / x86: Cleanup initrd related code
  ACPI / tables: Move table override mechanisms to tables.c

* acpi-osi:
  ACPI / osi: Collect _OSI handling into one single file
  ACPI / osi: Cleanup coding style issues before creating a separate OSI source file
  ACPI / osi: Cleanup OSI handling code to use bool
  ACPI / osi: Fix default _OSI(Darwin) support
  ACPI / osi: Add acpi_osi=!! to allow reverting acpi_osi=!
  ACPI / osi: Cleanup _OSI("Linux") related code before introducing new support
  ACPI / osi: Fix an issue that acpi_osi=!* cannot disable ACPICA internal strings

Conflicts:
	drivers/acpi/internal.h
---

efc499f9807bfc179c66b7c3524e30370c6fd1b1
diff --cc drivers/acpi/internal.h
index 7c18847,7c18847,1b0e6fd,a8780a2..9bb0773
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@@@ -20,7 -20,7 -20,6 -20,9 +20,8 @@@@@
    
    #define PREFIX "ACPI: "
    
--  void acpi_initrd_initialize_tables(void);
+++ int early_acpi_osi_init(void);
+++ int acpi_osi_init(void);
   -void acpi_initrd_initialize_tables(void);
    acpi_status acpi_os_initialize1(void);
    void init_acpi_device_notify(void);
    int acpi_scan_init(void);