• Rafael J. Wysocki's avatar
    Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi' · efc499f9
    Rafael J. Wysocki authored
    * 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
    efc499f9
Makefile 2.98 KB