From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 19 Mar 2026 13:57:06 +0000 (+0100)
Subject: Merge branches 'acpica' and 'acpi-bus'
X-Git-Tag: v7.0-rc5~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cbcd6c0742a2986782a9e2c92aa250d8f5c137d;p=thirdparty%2Flinux.git

Merge branches 'acpica' and 'acpi-bus'

Merge an ACPICA fix and a core ACPI support code fix for 7.0-rc5:

 - Update the format of the last argument of _DSM to avoid printing
   confusing error messages in some cases (Saket Dumbre)

 - Fix MFD child automatic modprobe issue by removing a stale check
   from acpi_companion_match() (Pratap Nirujogi)

* acpica:
  ACPICA: Update the format of Arg3 of _DSM

* acpi-bus:
  ACPI: bus: Fix MFD child automatic modprobe issue
---

5cbcd6c0742a2986782a9e2c92aa250d8f5c137d