From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 21 Aug 2025 18:47:23 +0000 (+0200)
Subject: Merge branches 'acpi-apei' and 'acpi-pfrut'
X-Git-Tag: v6.17-rc3~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=670b51121ed09ff3a41539243407e4bd52eea9f4;p=thirdparty%2Fkernel%2Fstable.git

Merge branches 'acpi-apei' and 'acpi-pfrut'

Merge ACPI APEI fixes and an ACPI platform firmware runtime update fix
for 6.17-rc3.

* acpi-apei:
  ACPI: APEI: EINJ: Fix resource leak by remove callback in .exit.text
  ACPI: APEI: EINJ: fix potential NULL dereference in __einj_error_inject()
  ACPI: APEI: EINJ: Check if user asked for EINJV2 injection

* acpi-pfrut:
  ACPI: pfr_update: Fix the driver update version check
---

670b51121ed09ff3a41539243407e4bd52eea9f4