Skip to content

Commit 15c78e7

Browse files
Automatic merge of 'master' into merge (2026-02-11 07:54)
2 parents 25ce7a5 + 2619c62 commit 15c78e7

3,643 files changed

Lines changed: 94623 additions & 57102 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mailmap

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -33,6 +34,7 @@ Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
3334
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
3435
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
3536
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
37+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@futurfusion.io>
3638
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin.ext@nsn.com>
3739
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@gmx.de>
3840
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nokia.com>
@@ -150,6 +152,7 @@ Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
150152
Björn Steinbrink <B.Steinbrink@gmx.de>
151153
Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
152154
Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
155+
Boqun Feng <boqun@kernel.org> <boqun.feng@gmail.com>
153156
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
154157
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
155158
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
@@ -207,6 +210,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
207210
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
208211
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
209212
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
213+
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
210214
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
211215
David Brownell <david-b@pacbell.net>
212216
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -416,6 +420,7 @@ Juha Yrjola <at solidboot.com>
416420
Juha Yrjola <juha.yrjola@nokia.com>
417421
Juha Yrjola <juha.yrjola@solidboot.com>
418422
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
423+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
419424
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
420425
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
421426
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -472,6 +477,10 @@ Linas Vepstas <linas@austin.ibm.com>
472477
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
473478
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
474479
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
480+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
481+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
482+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
483+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
475484
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
476485
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
477486
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -705,6 +714,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
705714
Santosh Shilimkar <santosh.shilimkar@oracle.org>
706715
Santosh Shilimkar <ssantosh@kernel.org>
707716
Sarangdhar Joshi <spjoshi@codeaurora.org>
717+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
718+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
708719
Sascha Hauer <s.hauer@pengutronix.de>
709720
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
710721
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -777,7 +788,8 @@ Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> <subashab@codeaurora.
777788
Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>
778789
Subhash Jadavani <subhashj@codeaurora.org>
779790
Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>
780-
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
791+
Sudeep Holla <sudeep.holla@kernel.org> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
792+
Sudeep Holla <sudeep.holla@kernel.org> <sudeep.holla@arm.com>
781793
Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
782794
Sumit Semwal <sumit.semwal@ti.com>
783795
Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
@@ -787,13 +799,16 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
787799
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
788800
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
789801
Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
802+
Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
790803
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
804+
Tamir Duberstein <tamird@kernel.org> <tamird@gmail.com>
791805
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
792806
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
793807
Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
794808
Tejun Heo <htejun@gmail.com>
795809
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
796810
Thomas Graf <tgraf@suug.ch>
811+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
797812
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
798813
Thomas Pedersen <twp@codeaurora.org>
799814
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
@@ -840,6 +855,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
840855
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
841856
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
842857
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
858+
Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>
843859
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
844860
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
845861
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
@@ -868,6 +884,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
868884
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
869885
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
870886
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
887+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
888+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
871889
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
872890
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
873891
Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ S: USA
695695
N: Chih-Jen Chang
696696
E: chihjenc@scf.usc.edu
697697
E: chihjen@iis.sinica.edu.tw
698-
D: IGMP(Internet Group Management Protocol) version 2
698+
D: IGMP (Internet Group Management Protocol) version 2
699699
S: 3F, 65 Tajen street
700700
S: Tamsui town, Taipei county,
701701
S: Taiwan 251
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems)
13981398
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
13991399

14001400
N: Thomas Gleixner
1401-
E: tglx@linutronix.de
1401+
E: tglx@kernel.org
14021402
D: NAND flash hardware support, JFFS2 on NAND flash
14031403

14041404
N: Jérôme Glisse
@@ -1997,7 +1997,7 @@ E: bkaindl@netway.at
19971997
E: edv@bartelt.via.at
19981998
D: Author of a menu based configuration tool, kmenu, which
19991999
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
2000-
D: digiboard driver update(modularisation work and 2.1.x upd)
2000+
D: digiboard driver update (modularisation work and 2.1.x upd)
20012001
S: Tallak 95
20022002
S: 8103 Rein
20032003
S: Austria
@@ -2231,6 +2231,10 @@ S: Markham, Ontario
22312231
S: L3R 8B2
22322232
S: Canada
22332233

2234+
N: Krzysztof Kozlowski
2235+
E: krzk@kernel.org
2236+
D: NFC network subsystem and drivers maintainer
2237+
22342238
N: Christian Krafft
22352239
D: PowerPC Cell support
22362240

@@ -3609,7 +3613,7 @@ S: Finland
36093613
N: Deepak Saxena
36103614
E: dsaxena@plexity.net
36113615
D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO
3612-
D: XScale(IOP, IXP) porting and other random ARM bits
3616+
D: XScale (IOP, IXP) porting and other random ARM bits
36133617
S: Portland, OR
36143618

36153619
N: Eric Schenk
@@ -3986,7 +3990,7 @@ S: D-50968 Köln
39863990

39873991
N: Tsu-Sheng Tsao
39883992
E: tsusheng@scf.usc.edu
3989-
D: IGMP(Internet Group Management Protocol) version 2
3993+
D: IGMP (Internet Group Management Protocol) version 2
39903994
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
39913995
S: Taipei
39923996
S: Taiwan 112

Documentation/ABI/stable/sysfs-block

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,51 @@ Description:
609609
enabled, and whether tags are shared.
610610

611611

612+
What: /sys/block/<disk>/queue/async_depth
613+
Date: August 2025
614+
Contact: linux-block@vger.kernel.org
615+
Description:
616+
[RW] Controls how many asynchronous requests may be allocated
617+
in the block layer. The value is always capped at nr_requests.
618+
619+
When no elevator is active (none):
620+
621+
- async_depth is always equal to nr_requests.
622+
623+
For bfq scheduler:
624+
625+
- By default, async_depth is set to 75% of nr_requests.
626+
Internal limits are then derived from this value:
627+
628+
* Sync writes: limited to async_depth (≈75% of nr_requests).
629+
* Async I/O: limited to ~2/3 of async_depth (≈50% of
630+
nr_requests).
631+
632+
If a bfq_queue is weight-raised:
633+
634+
* Sync writes: limited to ~1/2 of async_depth (≈37% of
635+
nr_requests).
636+
* Async I/O: limited to ~1/4 of async_depth (≈18% of
637+
nr_requests).
638+
639+
- If the user writes a custom value to async_depth, BFQ will
640+
recompute these limits proportionally based on the new value.
641+
642+
For Kyber:
643+
644+
- By default async_depth is set to 75% of nr_requests.
645+
- If the user writes a custom value to async_depth, then it
646+
overrides the default and directly controls the limit for
647+
writes and async I/O.
648+
649+
For mq-deadline:
650+
651+
- By default async_depth is set to nr_requests.
652+
- If the user writes a custom value to async_depth, then it
653+
overrides the default and directly controls the limit for
654+
writes and async I/O.
655+
656+
612657
What: /sys/block/<disk>/queue/nr_zones
613658
Date: November 2018
614659
Contact: Damien Le Moal <damien.lemoal@wdc.com>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
What: /sys/kernel/time/aux_clocks/<ID>/enable
22
Date: May 2025
3-
Contact: Thomas Gleixner <tglx@linutronix.de>
3+
Contact: Thomas Gleixner <tglx@kernel.org>
44
Description:
55
Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/pstore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Description: Generic interface to platform dependent persistent storage.
2626

2727
Once the information in a file has been read, removing
2828
the file will signal to the underlying persistent storage
29-
device that it can reclaim the space for later re-use::
29+
device that it can reclaim the space for later reuse::
3030

3131
$ rm /sys/fs/pstore/dmesg-erst-1
3232

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
What: /sys/bus/event_source/devices/cpu.../rdpmc
2+
Date: November 2011
3+
KernelVersion: 3.10
4+
Contact: Linux kernel mailing list linux-kernel@vger.kernel.org
5+
Description: The /sys/bus/event_source/devices/cpu.../rdpmc attribute
6+
is used to show/manage if rdpmc instruction can be
7+
executed in user space. This attribute supports 3 numbers.
8+
- rdpmc = 0
9+
user space rdpmc is globally disabled for all PMU
10+
counters.
11+
- rdpmc = 1
12+
user space rdpmc is globally enabled only in event mmap
13+
ioctl called time window. If the mmap region is unmapped,
14+
user space rdpmc is disabled again.
15+
- rdpmc = 2
16+
user space rdpmc is globally enabled for all PMU
17+
counters.
18+
19+
In the Intel platforms supporting counter level's user
20+
space rdpmc disable feature (CPUID.23H.EBX[2] = 1), the
21+
meaning of 3 numbers is extended to
22+
- rdpmc = 0
23+
global user space rdpmc and counter level's user space
24+
rdpmc of all counters are both disabled.
25+
- rdpmc = 1
26+
No changes on behavior of global user space rdpmc.
27+
counter level's rdpmc of system-wide events is disabled
28+
but counter level's rdpmc of non-system-wide events is
29+
enabled.
30+
- rdpmc = 2
31+
global user space rdpmc and counter level's user space
32+
rdpmc of all counters are both enabled unconditionally.
33+
34+
The default value of rdpmc is 1.
35+
36+
Please notice:
37+
- global user space rdpmc's behavior would change
38+
immediately along with the rdpmc value's change,
39+
but the behavior of counter level's user space rdpmc
40+
won't take effect immediately until the event is
41+
reactivated or recreated.
42+
- The rdpmc attribute is global, even for x86 hybrid
43+
platforms. For example, changing cpu_core/rdpmc will
44+
also change cpu_atom/rdpmc.

Documentation/ABI/testing/sysfs-bus-i3c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,14 @@ Contact: linux-i3c@vger.kernel.org
161161
Description:
162162
These directories are just symbolic links to
163163
/sys/bus/i3c/devices/i3c-<bus-id>/<bus-id>-<device-pid>.
164+
165+
What: /sys/bus/i3c/devices/i3c-<bus-id>/<bus-id>-<device-pid>/dev_nack_retry_count
166+
KernelVersion: 6.18
167+
Contact: linux-i3c@vger.kernel.org
168+
Description:
169+
Expose the dev_nak_retry_count which controls the number of
170+
automatic retries that will be performed by the controller when
171+
the target device returns a NACK response. A value of 0 disables
172+
the automatic retries. Exist only when I3C constroller supports
173+
this retry on nack feature.
174+

Documentation/ABI/testing/sysfs-class-tsm

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,3 @@ Description:
77
signals when the PCI layer is able to support establishment of
88
link encryption and other device-security features coordinated
99
through a platform tsm.
10-
11-
What: /sys/class/tsm/tsmN/streamH.R.E
12-
Contact: linux-pci@vger.kernel.org
13-
Description:
14-
(RO) When a host bridge has established a secure connection via
15-
the platform TSM, symlink appears. The primary function of this
16-
is have a system global review of TSM resource consumption
17-
across host bridges. The link points to the endpoint PCI device
18-
and matches the same link published by the host bridge. See
19-
Documentation/ABI/testing/sysfs-devices-pci-host-bridge.

Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Date: January 2012
1717
contact: Lee Jones <lee@kernel.org>
1818
Description:
1919
Read-only attribute common to all SoCs. Contains the SoC machine
20-
name (e.g. Ux500).
20+
name (e.g. DB8500).
2121

2222
What: /sys/devices/socX/family
2323
Date: January 2012
2424
contact: Lee Jones <lee@kernel.org>
2525
Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
27-
(e.g. DB8500).
27+
(e.g. ux500).
2828

2929
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
3030
this will contain the JEDEC JEP106 manufacturer’s identification

Documentation/ABI/testing/sysfs-driver-ccp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ Description:
88
0: Not fused
99
1: Fused
1010

11+
What: /sys/bus/pci/devices/<BDF>/boot_integrity
12+
Date: April 2026
13+
KernelVersion: 6.20
14+
Contact: mario.limonciello@amd.com
15+
Description:
16+
The /sys/bus/pci/devices/<BDF>/boot_integrity reports
17+
whether the AMD CPU or APU is used for a hardware root of trust
18+
during the boot process.
19+
Possible values:
20+
0: Not hardware root of trust.
21+
1: Hardware root of trust
22+
23+
NOTE: Vendors may provide design specific alternative hardware
24+
root of trust implementations.
25+
1126
What: /sys/bus/pci/devices/<BDF>/debug_lock_on
1227
Date: June 2022
1328
KernelVersion: 5.19

0 commit comments

Comments
 (0)