diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-29 15:28:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-09-29 15:28:51 +0200 |
| commit | c87072064bd482930a021e88c11f438e780d36de (patch) | |
| tree | bb54959d42532f2bd0f125cdc298b791ddfb2154 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | 02e9542558b8ee09994394cb6e06a1e4f0bf6f41 (diff) | |
| parent | 7d444f50999709d52a18ec7e88649ac936ab62dc (diff) | |
| parent | 39c87887606e5197723616c909d1f3054792f0dd (diff) | |
| parent | b8db5517fe5265d68abbceb3200fba1aecac4d5f (diff) | |
Merge branches 'acpi-apei', 'acpi-misc' and 'pnp'
Merge ACPI APEI updates, a miscellaneous update related to ACPI, and a
PNP update for 6.18-rc1:
- Remove redundant assignments in erst_dbg_{ioctl|write}() in the ACPI
APEI driver (Thorsten Blum)
- Allow the ACPI APEI EINJ to handle more types of addresses than just
MMIO (Jiaqi Yan)
- Use str_low_high() helper in two places in the ACPI code (Chelsy
Ratnawat)
- Use str_plural() to simplify the PNP code (Xichao Zhao)
* acpi-apei:
ACPI: APEI: EINJ: Allow more types of addresses except MMIO
ACPI: APEI: Remove redundant assignments in erst_dbg_{ioctl|write}()
* acpi-misc:
ACPI: Use str_low_high() helper in two places
* pnp:
PNP: isapnp: use str_plural() to simplify the code