From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 6 Jul 2023 17:24:06 +0000 (+0200)
Subject: Merge branches 'acpi-bus' and 'acpi-scan'
X-Git-Tag: v6.6.17~4421^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e178ee13b02d95c7380f6a21149de535ccdfc7f;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'acpi-bus' and 'acpi-scan'

Merge additional ACPI device enumeration code changes for 6.5-rc1.

 - Make acpi_companion_match() return a const pointer and update its
   callers accordingly (Andy Shevchenko).

 - Move the extern declaration of the acpi_root variable to a header
   file so as to address a compiler warning (Andy Shevchenko).

 - Address compiler warnings in the ACPI device enumeration code by
   adding a missing header file include to it (Ben Dooks).

 - Refine the SMB0001 quirk in the ACPI device enumeration code so as to
   address an i2c-scmi driver regression (Andy Shevchenko).

 - Clean up two pieces of the ACPI device enumeration code (Andy
   Shevchenko).

* acpi-bus:
  ACPI: bus: Constify acpi_companion_match() returned value

* acpi-scan:
  ACPI: scan: Use the acpi_match_acpi_device() helper
  ACPI: platform: Move SMB0001 HID to the header and reuse
  ACPI: platform: Ignore SMB0001 only when it has resources
  ACPI: bus: Introduce acpi_match_acpi_device() helper
  ACPI: scan: fix undeclared variable warnings by including sleep.h
  ACPI: scan: Move acpi_root to internal header
---

2e178ee13b02d95c7380f6a21149de535ccdfc7f