diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-19 14:57:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-19 14:57:06 +0100 |
| commit | 5cbcd6c0742a2986782a9e2c92aa250d8f5c137d (patch) | |
| tree | efb7e1f964fc19317ce802b3348e5c6cd5e2dc74 /include/uapi/linux/wimax/git@git.tavy.me:linux.git | |
| parent | bf504b229cb8d534eccbaeaa23eba34c05131e25 (diff) | |
| parent | ab93d7eee94205430fc3b0532557cb0494bf2faf (diff) | |
| parent | e7648ffecb7fcb7400e123bb6ea989633a104fc3 (diff) | |
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