Skip to content

Commit e0aaa4d

Browse files
committed
Merge branch 'master' of https://github.com/torvalds/linux into torvalds-master
2 parents dfe141d + 2061f18 commit e0aaa4d

File tree

7,870 files changed

+397914
-113425
lines changed

Some content is hidden

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

7,870 files changed

+397914
-113425
lines changed

.clang-format

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ ForEachMacros:
167167
- 'drm_connector_for_each_possible_encoder'
168168
- 'drm_exec_for_each_locked_object'
169169
- 'drm_exec_for_each_locked_object_reverse'
170-
- 'drm_for_each_bridge_in_chain'
170+
- 'drm_for_each_bridge_in_chain_scoped'
171171
- 'drm_for_each_connector_iter'
172172
- 'drm_for_each_crtc'
173173
- 'drm_for_each_crtc_reverse'
@@ -415,6 +415,7 @@ ForEachMacros:
415415
- 'for_each_prop_dlc_cpus'
416416
- 'for_each_prop_dlc_platforms'
417417
- 'for_each_property_of_node'
418+
- 'for_each_pt_level_entry'
418419
- 'for_each_rdt_resource'
419420
- 'for_each_reg'
420421
- 'for_each_reg_filtered'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
*.o.*
4242
*.patch
4343
*.pyc
44+
*.rlib
4445
*.rmeta
4546
*.rpm
4647
*.rsi

.mailmap

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
174174
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
175175
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
176176
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
177+
Chen-Yu Tsai <wens@kernel.org> <wens@csie.org>
177178
Chester Lin <chester62515@gmail.com> <clin@suse.com>
178179
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
179180
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
@@ -344,7 +345,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
344345
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
345346
Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
346347
Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
347-
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
348+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe.brucker@arm.com>
349+
Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe@linaro.org>
348350
Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>
349351
Jean Tourrilhes <jt@hpl.hp.com>
350352
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
@@ -589,8 +591,8 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
589591
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
590592
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
591593
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
592-
Nicolas Schier <nicolas.schier@linux.dev> <n.schier@avm.de>
593-
Nicolas Schier <nicolas.schier@linux.dev> <nicolas@fjasle.eu>
594+
Nicolas Schier <nsc@kernel.org> <n.schier@avm.de>
595+
Nicolas Schier <nsc@kernel.org> <nicolas@fjasle.eu>
594596
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
595597
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
596598
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
@@ -637,6 +639,7 @@ Peter Oruba <peter.oruba@amd.com>
637639
Peter Oruba <peter@oruba.de>
638640
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
639641
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
642+
Pratyush Yadav <pratyush@kernel.org> <ptyadav@amazon.de>
640643
Praveen BP <praveenbp@ti.com>
641644
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
642645
Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
@@ -694,6 +697,7 @@ Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
694697
Sam Protsenko <semen.protsenko@linaro.org>
695698
Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>
696699
Sam Ravnborg <sam@mars.ravnborg.org>
700+
Samuel Kayode <samkay014@gmail.com> <samuel.kayode@savoirfairelinux.com>
697701
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
698702
Santosh Shilimkar <santosh.shilimkar@oracle.org>
699703
Santosh Shilimkar <ssantosh@kernel.org>

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[MASTER]
2-
init-hook='import sys; sys.path += ["scripts/lib/kdoc", "scripts/lib/abi", "tools/docs/lib"]'
2+
init-hook='import sys; sys.path += ["tools/lib/python"]'
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/accel/accel<minor_nr>/dbc<N>_state
2+
Date: October 2025
3+
KernelVersion: 6.19
4+
Contact: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
5+
Description: Represents the current state of DMA Bridge channel (DBC). Below are the possible
6+
states:
7+
8+
=================== ==========================================================
9+
IDLE (0) DBC is free and can be activated
10+
ASSIGNED (1) DBC is activated and a workload is running on device
11+
BEFORE_SHUTDOWN (2) Sub-system associated with this workload has crashed and
12+
it will shutdown soon
13+
AFTER_SHUTDOWN (3) Sub-system associated with this workload has crashed and
14+
it has shutdown
15+
BEFORE_POWER_UP (4) Sub-system associated with this workload is shutdown and
16+
it will be powered up soon
17+
AFTER_POWER_UP (5) Sub-system associated with this workload is now powered up
18+
=================== ==========================================================
19+
Users: Any userspace application or clients interested in DBC state.

Documentation/ABI/testing/ima_policy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ Description:
2020
rule format: action [condition ...]
2121

2222
action: measure | dont_measure | appraise | dont_appraise |
23-
audit | hash | dont_hash
23+
audit | dont_audit | hash | dont_hash
2424
condition:= base | lsm [option]
2525
base: [[func=] [mask=] [fsmagic=] [fsuuid=] [fsname=]
26+
[fs_subtype=]
2627
[uid=] [euid=] [gid=] [egid=]
2728
[fowner=] [fgroup=]]
2829
lsm: [[subj_user=] [subj_role=] [subj_type=]
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
What: /sys/.../message
2+
Date: October 2021
3+
KernelVersion: 5.16
4+
Description:
5+
Controls the text message displayed on character line displays.
6+
7+
Reading returns the current message with a trailing newline.
8+
Writing updates the displayed message. Messages longer than the
9+
display width will automatically scroll. Trailing newlines in
10+
input are automatically trimmed.
11+
12+
Writing an empty string clears the display.
13+
14+
Example:
15+
echo "Hello World" > message
16+
cat message # Returns "Hello World\n"
17+
18+
What: /sys/.../num_chars
19+
Date: November 2025
20+
KernelVersion: 6.18
21+
Contact: Jean-François Lessard <jefflessard3@gmail.com>
22+
Description:
23+
Read-only attribute showing the character width capacity of
24+
the line display device. Messages longer than this will scroll.
25+
26+
Example:
27+
cat num_chars # Returns "16\n" for 16-char display
28+
29+
What: /sys/.../scroll_step_ms
30+
Date: October 2021
31+
KernelVersion: 5.16
32+
Description:
33+
Controls the scrolling speed for messages longer than the display
34+
width, specified in milliseconds per scroll step.
35+
36+
Setting to 0 disables scrolling. Default is 500ms.
37+
38+
Example:
39+
echo "250" > scroll_step_ms # 4Hz scrolling
40+
cat scroll_step_ms # Returns "250\n"
41+
42+
What: /sys/.../map_seg7
43+
Date: January 2024
44+
KernelVersion: 6.9
45+
Description:
46+
Read/write binary blob representing the ASCII-to-7-segment
47+
display conversion table used by the linedisp driver, as defined
48+
by struct seg7_conversion_map in <linux/map_to_7segment.h>.
49+
50+
Only visible on displays with 7-segment capability.
51+
52+
This attribute is not human-readable. Writes must match the
53+
struct size exactly, else -EINVAL is returned; reads return the
54+
entire mapping as a binary blob.
55+
56+
This interface and its implementation match existing conventions
57+
used in segment-mapped display drivers since 2005.
58+
59+
ABI note: This style of binary sysfs attribute *is an exception*
60+
to current "one value per file, text only" sysfs rules, for
61+
historical compatibility and driver uniformity. New drivers are
62+
discouraged from introducing additional binary sysfs ABIs.
63+
64+
Reference interface guidance:
65+
- include/uapi/linux/map_to_7segment.h
66+
67+
What: /sys/.../map_seg14
68+
Date: January 2024
69+
KernelVersion: 6.9
70+
Description:
71+
Read/write binary blob representing the ASCII-to-14-segment
72+
display conversion table used by the linedisp driver, as defined
73+
by struct seg14_conversion_map in <linux/map_to_14segment.h>.
74+
75+
Only visible on displays with 14-segment capability.
76+
77+
This attribute is not human-readable. Writes must match the
78+
struct size exactly, else -EINVAL is returned; reads return the
79+
entire mapping as a binary blob.
80+
81+
This interface and its implementation match existing conventions
82+
used by segment-mapped display drivers since 2005.
83+
84+
ABI note: This style of binary sysfs attribute *is an exception*
85+
to current "one value per file, text only" sysfs rules, for
86+
historical compatibility and driver uniformity. New drivers are
87+
discouraged from introducing additional binary sysfs ABIs.
88+
89+
Reference interface guidance:
90+
- include/uapi/linux/map_to_14segment.h

Documentation/ABI/testing/sysfs-block-bcache

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,6 @@ Description:
106106
will be discarded from the cache. Should not be turned off with
107107
writeback caching enabled.
108108

109-
What: /sys/block/<disk>/bcache/discard
110-
Date: November 2010
111-
Contact: Kent Overstreet <kent.overstreet@gmail.com>
112-
Description:
113-
For a cache, a boolean allowing discard/TRIM to be turned off
114-
or back on if the device supports it.
115-
116109
What: /sys/block/<disk>/bcache/bucket_size
117110
Date: November 2010
118111
Contact: Kent Overstreet <kent.overstreet@gmail.com>

Documentation/ABI/testing/sysfs-bus-cxl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,17 @@ Description:
496496
changed, only freed by writing 0. The kernel makes no guarantees
497497
that data is maintained over an address space freeing event, and
498498
there is no guarantee that a free followed by an allocate
499-
results in the same address being allocated.
499+
results in the same address being allocated. If extended linear
500+
cache is present, the size indicates extended linear cache size
501+
plus the CXL region size.
500502

503+
What: /sys/bus/cxl/devices/regionZ/extended_linear_cache_size
504+
Date: October, 2025
505+
KernelVersion: v6.19
506+
Contact: linux-cxl@vger.kernel.org
507+
Description:
508+
(RO) The size of extended linear cache, if there is an extended
509+
linear cache. Otherwise the attribute will not be visible.
501510

502511
What: /sys/bus/cxl/devices/regionZ/mode
503512
Date: January, 2023
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
What: /sys/class/power_supply/rt9756-*/watchdog_timer
2+
Date: Dec 2025
3+
KernelVersion: 6.19
4+
Contact: ChiYuan Huang <cy_huang@richtek.com>
5+
Description:
6+
This entry shows and sets the watchdog timer when rt9756 charger
7+
operates in charging mode. When the timer expires, the device
8+
will disable the charging. To prevent the timer expires, any
9+
host communication can make the timer restarted.
10+
11+
Access: Read, Write
12+
13+
Valid values:
14+
- 500, 1000, 5000, 30000, 40000, 80000, 128000 or 255000 (milliseconds),
15+
- 0: disabled
16+
17+
What: /sys/class/power_supply/rt9756-*/operation_mode
18+
Date: Dec 2025
19+
KernelVersion: 6.19
20+
Contact: ChiYuan Huang <cy_huang@richtek.com>
21+
Description:
22+
This entry shows and set the operation mode when rt9756 charger
23+
operates in charging phase. If 'bypass' mode is used, internal
24+
path will connect vbus directly to vbat. Else, default 'div2'
25+
mode for the switch-cap charging.
26+
27+
Access: Read, Write
28+
29+
Valid values:
30+
- 'bypass' or 'div2'

0 commit comments

Comments
 (0)