Commit 670b5112 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents b21d1fbb 8151320c

drivers/acpi/pfr_update.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static bool applicable_image(const void *data, struct pfru_update_cap_info *cap, 
	if (type == PFRU_CODE_INJECT_TYPE)

		return payload_hdr->rt_ver >= cap->code_rt_version;



	return payload_hdr->rt_ver >= cap->drv_rt_version;

	return payload_hdr->svn_ver >= cap->drv_svn;

}



static void print_update_debug_info(struct pfru_updated_result *result,

include/uapi/linux/pfrut.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct pfru_payload_hdr { 
	__u32 hw_ver;

	__u32 rt_ver;

	__u8 platform_id[16];

	__u32 svn_ver;

};



enum pfru_dsm_status {