Merge branches 'acpi-resources' and 'acpi-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Dec 2020 14:30:03 +0000 (15:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Dec 2020 14:30:03 +0000 (15:30 +0100)
commit5e2cde03da4006e06f002c0b410ca39833e760bd
treecd0dc3f73a3f90bf7492460878c3e54512f40326
parentb85195b7ec9d5d2bb2b0039586c955f49fc2e6ee
parent12fc4dad94dfac25599f31257aac181c691ca96f
parent390029c27ea74099a7f56f7ae502d11953fa1187
Merge branches 'acpi-resources' and 'acpi-docs'

* acpi-resources:
  Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"
  resource: provide meaningful MODULE_LICENSE() in test suite
  ASoC: Intel: catpt: Replace open coded variant of resource_intersection()
  ACPI: watchdog: Replace open coded variant of resource_union()
  PCI/ACPI: Replace open coded variant of resource_union()
  resource: Add test cases for new resource API
  resource: Introduce resource_intersection() for overlapping resources
  resource: Introduce resource_union() for overlapping resources
  resource: Group resource_overlaps() with other inline helpers
  resource: Simplify region_intersects() by reducing conditionals

* acpi-docs:
  Documentation: ACPI: enumeration: add PCI hierarchy representation
  Documentation: ACPI: _DSD: enable hyperlink in final references
  Documentation: ACPI: explain how to use gpio-line-names