Automatic merge of 'master' into merge-test (2025-12-22 09:14)

Author: maddy-kerneldev

.clang-format

@@ -140,8 +140,8 @@ ForEachMacros:
   - 'damon_for_each_scheme_safe'
   - 'damon_for_each_target'
   - 'damon_for_each_target_safe'
-  - 'damos_for_each_filter'
-  - 'damos_for_each_filter_safe'
+  - 'damos_for_each_core_filter'
+  - 'damos_for_each_core_filter_safe'
   - 'damos_for_each_ops_filter'
   - 'damos_for_each_ops_filter_safe'
   - 'damos_for_each_quota_goal'
@@ -167,7 +167,7 @@ ForEachMacros:
   - 'drm_connector_for_each_possible_encoder'
   - 'drm_exec_for_each_locked_object'
   - 'drm_exec_for_each_locked_object_reverse'
-  - 'drm_for_each_bridge_in_chain'
+  - 'drm_for_each_bridge_in_chain_scoped'
   - 'drm_for_each_connector_iter'
   - 'drm_for_each_crtc'
   - 'drm_for_each_crtc_reverse'
@@ -415,6 +415,7 @@ ForEachMacros:
   - 'for_each_prop_dlc_cpus'
   - 'for_each_prop_dlc_platforms'
   - 'for_each_property_of_node'
+  - 'for_each_pt_level_entry'
   - 'for_each_rdt_resource'
   - 'for_each_reg'
   - 'for_each_reg_filtered'
@@ -747,6 +748,7 @@ ForEachMacros:
   - 'ynl_attr_for_each_nested'
   - 'ynl_attr_for_each_payload'
   - 'zorro_for_each_dev'
+  - 'zpci_bus_for_each'
 
 IncludeBlocks: Preserve
 IncludeCategories:

.gitignore

@@ -41,6 +41,7 @@
 *.o.*
 *.patch
 *.pyc
+*.rlib
 *.rmeta
 *.rpm
 *.rsi

.mailmap

@@ -174,6 +174,7 @@ Carlos Bilbao <[email protected]> <[email protected]>
 Changbin Du <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
+Chen-Yu Tsai <[email protected]> <[email protected]>
 Chester Lin <[email protected]> <[email protected]>
 Chris Chiu <[email protected]> <[email protected]>
 Chris Chiu <[email protected]> <[email protected]>
@@ -185,6 +186,9 @@ Christian Brauner <[email protected]> <[email protected]>
 Christian Brauner <[email protected]> <[email protected]>
 Christian Brauner <[email protected]> <[email protected]>
 Christian Marangi <[email protected]>
+Christophe Leroy <[email protected]> <[email protected]>
+Christophe Leroy <[email protected]> <[email protected]>
+Christophe Leroy <[email protected]> <[email protected]>
 Christophe Ricard <[email protected]>
 Christopher Obbard <[email protected]> <[email protected]>
 Christoph Hellwig <[email protected]>
@@ -206,6 +210,7 @@ Danilo Krummrich <[email protected]> <[email protected]>
 David Brownell <[email protected]>
 David Collins <[email protected]> <[email protected]>
 David Heidelberg <[email protected]> <[email protected]>
+David Hildenbrand <[email protected]> <[email protected]>
 David Rheinsberg <[email protected]> <[email protected]>
 David Rheinsberg <[email protected]> <[email protected]>
 David Rheinsberg <[email protected]> <[email protected]>
@@ -298,6 +303,7 @@ Hans de Goede <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
+Hao Ge <[email protected]> <[email protected]>
 Harry Yoo <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>
@@ -343,7 +349,8 @@ Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
-<[email protected]> <[email protected]>
+Jean-Philippe Brucker <[email protected]> <[email protected]>
+Jean-Philippe Brucker <[email protected]> <[email protected]>
 Jean-Michel Hautbois <[email protected]> <[email protected]>
 Jean Tourrilhes <[email protected]>
 Jeevan Shriram <[email protected]> <[email protected]>
@@ -426,7 +433,7 @@ Kenneth W Chen <[email protected]>
 Kenneth Westfield <[email protected]> <[email protected]>
 Kiran Gunda <[email protected]> <[email protected]>
 Kirill Tkhai <[email protected]> <[email protected]>
-Kirill A. Shutemov <[email protected]> <[email protected]>
+Kiryl Shutsemau <[email protected]> <[email protected]>
 Kishon Vijay Abraham I <[email protected]> <[email protected]>
 Konrad Dybcio <[email protected]> <[email protected]>
 Konrad Dybcio <[email protected]> <[email protected]>
@@ -437,6 +444,7 @@ Krishna Manikandan <[email protected]> <[email protected]>
 Krzysztof Kozlowski <[email protected]> <[email protected]>
 Krzysztof Kozlowski <[email protected]> <[email protected]>
 Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
 Krzysztof Wilczyński <[email protected]> <[email protected]>
 Krzysztof Wilczyński <[email protected]> <[email protected]>
 Kshitiz Godara <[email protected]> <[email protected]>
@@ -496,9 +504,7 @@ Mark Brown <[email protected]>
 Mark Starovoytov <[email protected]> <[email protected]>
 Markus Schneider-Pargmann <[email protected]> <[email protected]>
 Mark Yao <[email protected]> <[email protected]>
-Martin Kepplinger <[email protected]> <[email protected]>
-Martin Kepplinger <[email protected]> <[email protected]>
-Martin Kepplinger <[email protected]> <[email protected]>
+Martin Kepplinger-Novakovic <[email protected]> <[email protected]>
 Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
 Mathieu Othacehe <[email protected]> <[email protected]>
 Mat Martineau <[email protected]> <[email protected]>
@@ -587,8 +593,8 @@ Nicolas Pitre <[email protected]> <[email protected]>
 Nicolas Pitre <[email protected]> <[email protected]>
 Nicolas Saenz Julienne <[email protected]> <[email protected]>
 Nicolas Saenz Julienne <[email protected]> <[email protected]>
-Nicolas Schier <[email protected]> <[email protected]>
-Nicolas Schier <[email protected]> <[email protected]>
+Nicolas Schier <[email protected]> <[email protected]>
+Nicolas Schier <[email protected]> <[email protected]>
 Niklas Söderlund <[email protected]>
 Nikolay Aleksandrov <[email protected]> <[email protected]>
 Nikolay Aleksandrov <[email protected]> <[email protected]>
@@ -635,6 +641,7 @@ Peter Oruba <[email protected]>
 Peter Oruba <[email protected]>
 Pierre-Louis Bossart <[email protected]> <[email protected]>
 Pratyush Anand <[email protected]> <[email protected]>
+Pratyush Yadav <[email protected]> <[email protected]>
 Praveen BP <[email protected]>
 Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
 Prasad Sodagudi <[email protected]> <[email protected]>
@@ -689,7 +696,10 @@ Sachin Mokashi <[email protected]> <[email protected]>
 Sachin P Sant <[email protected]>
 Sai Prakash Ranjan <[email protected]> <[email protected]>
 Sakari Ailus <[email protected]> <[email protected]>
+Sam Protsenko <[email protected]>
+Sam Protsenko <[email protected]> <[email protected]>
 Sam Ravnborg <[email protected]>
+Samuel Kayode <[email protected]> <[email protected]>
 Sankeerth Billakanti <[email protected]> <[email protected]>
 Santosh Shilimkar <[email protected]>
 Santosh Shilimkar <[email protected]>
@@ -845,6 +855,9 @@ Vivien Didelot <[email protected]> <[email protected]>
 Vlad Dogaru <[email protected]> <[email protected]>
 Vladimir Davydov <[email protected]> <[email protected]>
 Vladimir Davydov <[email protected]> <[email protected]>
+WangYuli <[email protected]> <[email protected]>
+WangYuli <[email protected]> <[email protected]>
+WangYuli <[email protected]> <[email protected]>
 Weiwen Hu <[email protected]> <[email protected]>
 WeiXiong Liao <[email protected]> <[email protected]>
 Wen Gong <[email protected]> <[email protected]>
@@ -856,6 +869,7 @@ Yakir Yang <[email protected]> <[email protected]>
 Yanteng Si <[email protected]> <[email protected]>
 Ying Huang <[email protected]> <[email protected]>
 Yosry Ahmed <[email protected]> <[email protected]>
+Yu-Chun Lin <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
 Zack Rusin <[email protected]> <[email protected]>
 Zhu Yanjun <[email protected]> <[email protected]>

.pylintrc

@@ -1,2 +1,2 @@
 [MASTER]
-init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi", "tools/docs/lib"]'
+init-hook='import sys; sys.path += ["tools/lib/python"]'

CREDITS

@@ -16,6 +16,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
 S: (ask for current address)
 S: Finland
 
+N: Kishon Vijay Abraham I
+E: [email protected]
+D: Generic Phy Framework
+
 N: Thomas Abraham
 E: [email protected]
 D: Samsung pin controller driver
@@ -1983,6 +1987,7 @@ D: netfilter: TCP window tracking code
 D: netfilter: raw table
 D: netfilter: iprange match
 D: netfilter: new logging interfaces
+D: netfilter: ipset
 D: netfilter: various other hacks
 S: Tata
 S: Hungary
@@ -2056,16 +2061,15 @@ S: Korte Heul 95
 S: 1403 ND  BUSSUM
 S: The Netherlands
 
-N: Martin Kepplinger
+N: Martin Kepplinger-Novakovic
 E: [email protected]
-E: [email protected]
-W: http://www.martinkepplinger.com
 P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468  6E3F 5003 98DF 5AB3 87D3
 D: mma8452 accelerators iio driver
 D: pegasus_notetaker input driver
+D: imx8m media and hi846 sensor driver
 D: Kernel fixes and cleanups
-S: Garnisonstraße 26
-S: 4020 Linz
+S: Keplerstr. 6
+S: 4050 Traun
 S: Austria
 
 N: Karl Keyte

Documentation/ABI/obsolete/sysfs-kernel-kexec-kdump

@@ -0,0 +1,71 @@
+NOTE: all the ABIs listed in this file are deprecated and will be removed after 2028.
+
+Here are the alternative ABIs:
++------------------------------------+-----------------------------------------+
+| Deprecated                         | Alternative                             |
++------------------------------------+-----------------------------------------+
+| /sys/kernel/kexec_loaded           | /sys/kernel/kexec/loaded                |
++------------------------------------+-----------------------------------------+
+| /sys/kernel/kexec_crash_loaded     | /sys/kernel/kexec/crash_loaded          |
++------------------------------------+-----------------------------------------+
+| /sys/kernel/kexec_crash_size       | /sys/kernel/kexec/crash_size            |
++------------------------------------+-----------------------------------------+
+| /sys/kernel/crash_elfcorehdr_size  | /sys/kernel/kexec/crash_elfcorehdr_size |
++------------------------------------+-----------------------------------------+
+| /sys/kernel/kexec_crash_cma_ranges | /sys/kernel/kexec/crash_cma_ranges      |
++------------------------------------+-----------------------------------------+
+
+
+What:		/sys/kernel/kexec_loaded
+Date:		Jun 2006
+Contact:	[email protected]
+Description:	read only
+		Indicates whether a new kernel image has been loaded
+		into memory using the kexec system call. It shows 1 if
+		a kexec image is present and ready to boot, or 0 if none
+		is loaded.
+User:		kexec tools, kdump service
+
+What:		/sys/kernel/kexec_crash_loaded
+Date:		Jun 2006
+Contact:	[email protected]
+Description:	read only
+		Indicates whether a crash (kdump) kernel is currently
+		loaded into memory. It shows 1 if a crash kernel has been
+		successfully loaded for panic handling, or 0 if no crash
+		kernel is present.
+User:		Kexec tools, Kdump service
+
+What:		/sys/kernel/kexec_crash_size
+Date:		Dec 2009
+Contact:	[email protected]
+Description:	read/write
+		Shows the amount of memory reserved for loading the crash
+		(kdump) kernel. It reports the size, in bytes, of the
+		crash kernel area defined by the crashkernel= parameter.
+		This interface also allows reducing the crashkernel
+		reservation by writing a smaller value, and the reclaimed
+		space is added back to the system RAM.
+User:		Kdump service
+
+What:		/sys/kernel/crash_elfcorehdr_size
+Date:		Aug 2023
+Contact:	[email protected]
+Description:	read only
+		Indicates the preferred size of the memory buffer for the
+		ELF core header used by the crash (kdump) kernel. It defines
+		how much space is needed to hold metadata about the crashed
+		system, including CPU and memory information. This information
+		is used by the user space utility kexec to support updating the
+		in-kernel kdump image during hotplug operations.
+User:		Kexec tools
+
+What:		/sys/kernel/kexec_crash_cma_ranges
+Date:		Nov 2025
+Contact:	[email protected]
+Description:	read only
+		Provides information about the memory ranges reserved from
+		the Contiguous Memory Allocator (CMA) area that are allocated
+		to the crash (kdump) kernel. It lists the start and end physical
+		addresses of CMA regions assigned for crashkernel use.
+User:		kdump service

Documentation/ABI/stable/sysfs-driver-qaic

@@ -0,0 +1,19 @@
+What:		/sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/accel/accel<minor_nr>/dbc<N>_state
+Date:		October 2025
+KernelVersion:	6.19
+Contact:	Jeff Hugo <[email protected]>
+Description:	Represents the current state of DMA Bridge channel (DBC). Below are the possible
+		states:
+
+		===================	==========================================================
+		IDLE (0)		DBC is free and can be activated
+		ASSIGNED (1)		DBC is activated and a workload is running on device
+		BEFORE_SHUTDOWN (2)	Sub-system associated with this workload has crashed and
+					it will shutdown soon
+		AFTER_SHUTDOWN (3)	Sub-system associated with this workload has crashed and
+					it has shutdown
+		BEFORE_POWER_UP (4)	Sub-system associated with this workload is shutdown and
+					it will be powered up soon
+		AFTER_POWER_UP (5)	Sub-system associated with this workload is now powered up
+		===================	==========================================================
+Users:		Any userspace application or clients interested in DBC state.

Documentation/ABI/testing/ima_policy

@@ -20,9 +20,10 @@ Description:
 		  rule format: action [condition ...]
 
 		  action: measure | dont_measure | appraise | dont_appraise |
-			  audit | hash | dont_hash
+			  audit | dont_audit | hash | dont_hash
 		  condition:= base | lsm  [option]
 			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [fsname=]
+				[fs_subtype=]
 				[uid=] [euid=] [gid=] [egid=]
 				[fowner=] [fgroup=]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]

Documentation/ABI/testing/rtc-cdev

@@ -14,7 +14,7 @@ Description:
 		  for RTCs that support alarms
 
 		* RTC_ALM_READ, RTC_ALM_SET: Read or set the alarm time for
-		  RTCs that support alarms. Can be set upto 24 hours in the
+		  RTCs that support alarms. Can be set up to 24 hours in the
 		  future. Requires a separate RTC_AIE_ON call to enable the
 		  alarm interrupt. (Prefer to use RTC_WKALM_*)