From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 23 Apr 2026 18:59:48 +0000 (+0200)
Subject: Merge branches 'acpi-scan', 'acpi-apei' and 'acpi-video'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beca8264d502bbe8509141432c73ab7a816a4076;p=thirdparty%2Fkernel%2Fstable.git

Merge branches 'acpi-scan', 'acpi-apei' and 'acpi-video'

Merge an ACPI core fix, a fix for the new NVIDIA GHES HANDLER entry in
MAINTAINERS, a new quirk for the ACPI video bus driver and a quirk list
fix for that driver for 7.1-rc1:

 - Use acpi_dev_put() in object add error paths in the ACPI core to
   avoid refcount leaks (Guangshuo Li)

 - Adjust the file entry in the recently added NVIDIA GHES HANDLER entry
   in MAINTAINERS to the actual existing file (Lukas Bulwahn)

 - Add backlight=native quirk for Dell OptiPlex 7770 AIO to the ACPI
   video bus driver (Jan Schär)

 - Move Lenovo Legion S7 15ACH6 quirk to the right section of the quirk
   list in the ACPI video bus driver (Hans de Goede)

* acpi-scan:
  ACPI: scan: Use acpi_dev_put() in object add error paths

* acpi-apei:
  MAINTAINERS: adjust file entry in NVIDIA GHES HANDLER

* acpi-video:
  ACPI: video: Move Lenovo Legion S7 15ACH6 quirk to the right section
  ACPI: video: Add backlight=native quirk for Dell OptiPlex 7770 AIO
---

beca8264d502bbe8509141432c73ab7a816a4076