From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 9 Apr 2026 19:19:34 +0000 (+0200)
Subject: Merge branches 'acpica', 'acpi-osl' and 'acpi-tables'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e2308c1aec91b32640c488205f4fe6d6cc8d1de;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'acpica', 'acpi-osl' and 'acpi-tables'

Merge ACPICA updates, an ACPI OS service layer (OSL) update and
assorted updates related to parsing ACPI tables for 7.1-rc1:

 - Update maintainers information regarding ACPICA (Rafael Wysocki)

 - Replace strncpy() with strscpy_pad() in acpi_ut_safe_strncpy() (Kees
   Cook)

 - Trigger an ordered system power off after encountering a fatal error
   operator in AML (Armin Wolf)

 - Enable ACPI FPDT parsing on LoongArch (Xi Ruoyao)

 - Remove the temporary stop-gap acpi_pptt_cache_v1_full structure from
   the ACPI PPTT parser (Ben Horgan)

 - Add support for exposing ACPI FPDT subtables FBPT and S3PT (Nate
   DeSimone)

* acpica:
  ACPICA: Update maintainers information
  ACPICA: Replace strncpy() with strscpy_pad() in acpi_ut_safe_strncpy()

* acpi-osl:
  ACPI: OSL: Poweroff when encountering a fatal ACPI error

* acpi-tables:
  ACPI: tables: Enable FPDT on LoongArch
  Documentation: ABI: add FBPT and S3PT entries to sysfs-firmware-acpi
  ACPI: FPDT: expose FBPT and S3PT subtables via sysfs
  ACPI: PPTT: Remove duplicate structure, acpi_pptt_cache_v1_full
---

8e2308c1aec91b32640c488205f4fe6d6cc8d1de
diff --cc MAINTAINERS
index c3fe46d7c4bc4,cff7e08206d59,77fdfcb55f060,7d10988cbc62b..0fb26c9695eb1
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@@ -8628,14 -8628,8 -8626,9 -8628,8 +8628,14 @@@@@ F:	drivers/gpu/drm/lima
    F:	include/uapi/drm/lima_drm.h
    
    DRM DRIVERS FOR LOONGSON
  - M:	Sui Jingfeng <suijingfeng@loongson.cn>
 +++M:	Jianmin Lv <lvjianmin@loongson.cn>
 +++M:	Qianhai Wu <wuqianhai@loongson.cn>
 +++R:	Huacai Chen <chenhuacai@kernel.org>
 +++R:	Mingcong Bai <jeffbai@aosc.io>
 +++R:	Xi Ruoyao <xry111@xry111.site>
 +++R:	Icenowy Zheng <zhengxingda@iscas.ac.cn>
    L:	dri-devel@lists.freedesktop.org
 - -S:	Orphan
  - S:	Supported
 +++S:	Maintained
    T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git
    F:	drivers/gpu/drm/loongson/
    
@@@@@ -24352,9 -24343,9 -24333,7 -24343,9 +24352,9 @@@@@ F:	drivers/nvmem/layouts/sl28vpd.
    
    SLAB ALLOCATOR
    M:	Vlastimil Babka <vbabka@kernel.org>
 - -M:	Harry Yoo <harry.yoo@oracle.com>
 +++M:	Harry Yoo <harry@kernel.org>
    M:	Andrew Morton <akpm@linux-foundation.org>
  + R:	Hao Li <hao.li@linux.dev>
    R:	Christoph Lameter <cl@gentwo.org>
    R:	David Rientjes <rientjes@google.com>
    R:	Roman Gushchin <roman.gushchin@linux.dev>