From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 15 Dec 2020 14:30:03 +0000 (+0100)
Subject: Merge branches 'acpi-resources' and 'acpi-docs'
X-Git-Tag: microblaze-v5.12~153^2~2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=5e2cde03da4006e06f002c0b410ca39833e760bd;p=linux-2.6-microblaze.git

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
---

5e2cde03da4006e06f002c0b410ca39833e760bd