diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 11:04:59 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-08-14 11:04:59 +0300 |
commit | 4a3f421b878d6240a01a556e036a38baf3268c26 (patch) | |
tree | 36adb21de0f7938aaf8fb9a1122eded9147ea122 /drivers/infiniband | |
parent | aba941392aeef2d1bc064a1e4b09293473ef7b9b (diff) | |
parent | 398404d8372ce0428abc49d059487e3f83d45249 (diff) | |
parent | a4138e7c12287268348cc2dcad414a62c515d77a (diff) | |
download | linux-4a3f421b878d6240a01a556e036a38baf3268c26.tar.xz |
Merge branches 'acpica' and 'acpi-property'
Merge ACPICA changes and updates of the ACPI device properties
framework for 4.19.
These revert two ACPICA commits that are not needed any more and
modify the properties graph support in ACPI to be more in-line with
the analogous DT code.
* acpica:
ACPICA: Update version to 20180629
ACPICA: Revert "iASL compiler: allow compilation of externals with paths that refer to existing names"
ACPICA: Revert "iASL: change processing of external op namespace nodes for correctness"
* acpi-property:
ACPI: property: graph: Update graph documentation to use generic references
ACPI: property: graph: Improve graph documentation for port/ep numbering
ACPI: property: graph: Fix graph documentation
ACPI: property: Update documentation for hierarchical data extension 1.1
ACPI: property: Document key numbering for hierarchical data extension refs
ACPI: property: Use data node name and reg property for graphs
ACPI: property: Allow direct graph endpoint references
ACPI: property: Make the ACPI graph API private
ACPI: property: Document hierarchical data extension references
ACPI: property: Allow making references to non-device nodes
ACPI: Convert ACPI reference args to generic fwnode reference args