Skip to content

Commit 79c13ba

Browse files
Merge pull request #40 from torvalds/master
Sync updates
2 parents 19f6d30 + 40fbbd6 commit 79c13ba

File tree

624 files changed

+19587
-7037
lines changed

Some content is hidden

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

624 files changed

+19587
-7037
lines changed

Documentation/ABI/testing/rtc-cdev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Description:
1414
for RTCs that support alarms
1515

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

Documentation/ABI/testing/sysfs-class-platform-profile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Description: This file contains a space-separated list of profiles supported
2323
power consumption with a slight bias
2424
towards performance
2525
performance High performance operation
26+
max-power Higher performance operation that may exceed
27+
internal battery draw limits when on AC power
2628
custom Driver defined custom profile
2729
==================== ========================================
2830

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
What: /sys/bus/platform/devices/INOU0000:XX/fn_lock_toggle_enable
2+
Date: November 2025
3+
KernelVersion: 6.19
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
Allows userspace applications to enable/disable the FN lock feature
7+
of the integrated keyboard by writing "1"/"0" into this file.
8+
9+
Reading this file returns the current enable status of the FN lock functionality.
10+
11+
What: /sys/bus/platform/devices/INOU0000:XX/super_key_toggle_enable
12+
Date: November 2025
13+
KernelVersion: 6.19
14+
Contact: Armin Wolf <W_Armin@gmx.de>
15+
Description:
16+
Allows userspace applications to enable/disable the super key functionality
17+
of the integrated keyboard by writing "1"/"0" into this file.
18+
19+
Reading this file returns the current enable status of the super key functionality.
20+
21+
What: /sys/bus/platform/devices/INOU0000:XX/touchpad_toggle_enable
22+
Date: November 2025
23+
KernelVersion: 6.19
24+
Contact: Armin Wolf <W_Armin@gmx.de>
25+
Description:
26+
Allows userspace applications to enable/disable the touchpad toggle functionality
27+
of the integrated touchpad by writing "1"/"0" into this file.
28+
29+
Reading this file returns the current enable status of the touchpad toggle
30+
functionality.
31+
32+
What: /sys/bus/platform/devices/INOU0000:XX/rainbow_animation
33+
Date: November 2025
34+
KernelVersion: 6.19
35+
Contact: Armin Wolf <W_Armin@gmx.de>
36+
Description:
37+
Forces the integrated lightbar to display a rainbow animation when the machine
38+
is not suspended. Writing "1"/"0" into this file enables/disables this
39+
functionality.
40+
41+
Reading this file returns the current status of the rainbow animation functionality.
42+
43+
What: /sys/bus/platform/devices/INOU0000:XX/breathing_in_suspend
44+
Date: November 2025
45+
KernelVersion: 6.19
46+
Contact: Armin Wolf <W_Armin@gmx.de>
47+
Description:
48+
Causes the integrated lightbar to display a breathing animation when the machine
49+
has been suspended and is running on AC power. Writing "1"/"0" into this file
50+
enables/disables this functionality.
51+
52+
Reading this file returns the current status of the breathing animation
53+
functionality.

Documentation/ABI/testing/sysfs-platform-asus-wmi

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Date: Aug 2022
6363
KernelVersion: 6.1
6464
Contact: "Luke Jones" <luke@ljones.dev>
6565
Description:
66+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
6667
Switch the GPU hardware MUX mode. Laptops with this feature can
6768
can be toggled to boot with only the dGPU (discrete mode) or in
6869
standard Optimus/Hybrid mode. On switch a reboot is required:
@@ -75,6 +76,7 @@ Date: Aug 2022
7576
KernelVersion: 5.17
7677
Contact: "Luke Jones" <luke@ljones.dev>
7778
Description:
79+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
7880
Disable discrete GPU:
7981
* 0 - Enable dGPU,
8082
* 1 - Disable dGPU
@@ -84,6 +86,7 @@ Date: Aug 2022
8486
KernelVersion: 5.17
8587
Contact: "Luke Jones" <luke@ljones.dev>
8688
Description:
89+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
8790
Enable the external GPU paired with ROG X-Flow laptops.
8891
Toggling this setting will also trigger ACPI to disable the dGPU:
8992

@@ -95,6 +98,7 @@ Date: Aug 2022
9598
KernelVersion: 5.17
9699
Contact: "Luke Jones" <luke@ljones.dev>
97100
Description:
101+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
98102
Enable an LCD response-time boost to reduce or remove ghosting:
99103
* 0 - Disable,
100104
* 1 - Enable
@@ -104,6 +108,7 @@ Date: Jun 2023
104108
KernelVersion: 6.5
105109
Contact: "Luke Jones" <luke@ljones.dev>
106110
Description:
111+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
107112
Get the current charging mode being used:
108113
* 1 - Barrel connected charger,
109114
* 2 - USB-C charging
@@ -114,6 +119,7 @@ Date: Jun 2023
114119
KernelVersion: 6.5
115120
Contact: "Luke Jones" <luke@ljones.dev>
116121
Description:
122+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
117123
Show if the egpu (XG Mobile) is correctly connected:
118124
* 0 - False,
119125
* 1 - True
@@ -123,6 +129,7 @@ Date: Jun 2023
123129
KernelVersion: 6.5
124130
Contact: "Luke Jones" <luke@ljones.dev>
125131
Description:
132+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
126133
Change the mini-LED mode:
127134
* 0 - Single-zone,
128135
* 1 - Multi-zone
@@ -133,13 +140,15 @@ Date: Apr 2024
133140
KernelVersion: 6.10
134141
Contact: "Luke Jones" <luke@ljones.dev>
135142
Description:
143+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
136144
List the available mini-led modes.
137145

138146
What: /sys/devices/platform/<platform>/ppt_pl1_spl
139147
Date: Jun 2023
140148
KernelVersion: 6.5
141149
Contact: "Luke Jones" <luke@ljones.dev>
142150
Description:
151+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
143152
Set the Package Power Target total of CPU: PL1 on Intel, SPL on AMD.
144153
Shown on Intel+Nvidia or AMD+Nvidia based systems:
145154

@@ -150,6 +159,7 @@ Date: Jun 2023
150159
KernelVersion: 6.5
151160
Contact: "Luke Jones" <luke@ljones.dev>
152161
Description:
162+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
153163
Set the Slow Package Power Tracking Limit of CPU: PL2 on Intel, SPPT,
154164
on AMD. Shown on Intel+Nvidia or AMD+Nvidia based systems:
155165

@@ -160,6 +170,7 @@ Date: Jun 2023
160170
KernelVersion: 6.5
161171
Contact: "Luke Jones" <luke@ljones.dev>
162172
Description:
173+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
163174
Set the Fast Package Power Tracking Limit of CPU. AMD+Nvidia only:
164175
* min=5, max=250
165176

@@ -168,6 +179,7 @@ Date: Jun 2023
168179
KernelVersion: 6.5
169180
Contact: "Luke Jones" <luke@ljones.dev>
170181
Description:
182+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
171183
Set the APU SPPT limit. Shown on full AMD systems only:
172184
* min=5, max=130
173185

@@ -176,6 +188,7 @@ Date: Jun 2023
176188
KernelVersion: 6.5
177189
Contact: "Luke Jones" <luke@ljones.dev>
178190
Description:
191+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
179192
Set the platform SPPT limit. Shown on full AMD systems only:
180193
* min=5, max=130
181194

@@ -184,6 +197,7 @@ Date: Jun 2023
184197
KernelVersion: 6.5
185198
Contact: "Luke Jones" <luke@ljones.dev>
186199
Description:
200+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
187201
Set the dynamic boost limit of the Nvidia dGPU:
188202
* min=5, max=25
189203

@@ -192,6 +206,7 @@ Date: Jun 2023
192206
KernelVersion: 6.5
193207
Contact: "Luke Jones" <luke@ljones.dev>
194208
Description:
209+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
195210
Set the target temperature limit of the Nvidia dGPU:
196211
* min=75, max=87
197212

@@ -200,6 +215,7 @@ Date: Apr 2024
200215
KernelVersion: 6.10
201216
Contact: "Luke Jones" <luke@ljones.dev>
202217
Description:
218+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
203219
Set if the BIOS POST sound is played on boot.
204220
* 0 - False,
205221
* 1 - True
@@ -209,6 +225,7 @@ Date: Apr 2024
209225
KernelVersion: 6.10
210226
Contact: "Luke Jones" <luke@ljones.dev>
211227
Description:
228+
DEPRECATED, WILL BE REMOVED SOON: please use asus-armoury
212229
Set if the MCU can go in to low-power mode on system sleep
213230
* 0 - False,
214231
* 1 - True
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/devices/platform/ayaneo-ec/controller_power
2+
Date: Nov 2025
3+
KernelVersion: 6.19
4+
Contact: "Antheas Kapenekakis" <lkml@antheas.dev>
5+
Description:
6+
Current controller power state. Allows turning on and off
7+
the controller power (e.g. for power savings). Write 1 to
8+
turn on, 0 to turn off. File is readable and writable.
9+
10+
What: /sys/devices/platform/ayaneo-ec/controller_modules
11+
Date: Nov 2025
12+
KernelVersion: 6.19
13+
Contact: "Antheas Kapenekakis" <lkml@antheas.dev>
14+
Description:
15+
Shows which controller modules are currently connected to
16+
the device. Possible values are "left", "right" and "both".
17+
File is read-only. The Windows software for this device
18+
will only set controller power to 1 if both module sides
19+
are connected (i.e. this file returns "both").

Documentation/admin-guide/device-mapper/dm-raid.rst

Lines changed: 73 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ The target is named "raid" and it accepts the following parameters::
2020
raid0 RAID0 striping (no resilience)
2121
raid1 RAID1 mirroring
2222
raid4 RAID4 with dedicated last parity disk
23-
raid5_n RAID5 with dedicated last parity disk supporting takeover
23+
raid5_n RAID5 with dedicated last parity disk supporting takeover from/to raid1
2424
Same as raid4
2525

26-
- Transitory layout
26+
- Transitory layout for takeover from/to raid1
2727
raid5_la RAID5 left asymmetric
2828

2929
- rotating parity 0 with data continuation
@@ -48,8 +48,8 @@ The target is named "raid" and it accepts the following parameters::
4848
raid6_n_6 RAID6 with dedicate parity disks
4949

5050
- parity and Q-syndrome on the last 2 disks;
51-
layout for takeover from/to raid4/raid5_n
52-
raid6_la_6 Same as "raid_la" plus dedicated last Q-syndrome disk
51+
layout for takeover from/to raid0/raid4/raid5_n
52+
raid6_la_6 Same as "raid_la" plus dedicated last Q-syndrome disk supporting takeover from/to raid5
5353

5454
- layout for takeover from raid5_la from/to raid6
5555
raid6_ra_6 Same as "raid5_ra" dedicated last Q-syndrome disk
@@ -173,9 +173,9 @@ The target is named "raid" and it accepts the following parameters::
173173
The delta_disks option value (-251 < N < +251) triggers
174174
device removal (negative value) or device addition (positive
175175
value) to any reshape supporting raid levels 4/5/6 and 10.
176-
RAID levels 4/5/6 allow for addition of devices (metadata
177-
and data device tuple), raid10_near and raid10_offset only
178-
allow for device addition. raid10_far does not support any
176+
RAID levels 4/5/6 allow for addition and removal of devices
177+
(metadata and data device tuple), raid10_near and raid10_offset
178+
only allow for device addition. raid10_far does not support any
179179
reshaping at all.
180180
A minimum of devices have to be kept to enforce resilience,
181181
which is 3 devices for raid4/5 and 4 devices for raid6.
@@ -372,6 +372,72 @@ to safely enable discard support for RAID 4/5/6:
372372
'devices_handle_discards_safely'
373373

374374

375+
Takeover/Reshape Support
376+
------------------------
377+
The target natively supports these two types of MDRAID conversions:
378+
379+
o Takeover: Converts an array from one RAID level to another
380+
381+
o Reshape: Changes the internal layout while maintaining the current RAID level
382+
383+
Each operation is only valid under specific constraints imposed by the existing array's layout and configuration.
384+
385+
386+
Takeover:
387+
linear -> raid1 with N >= 2 mirrors
388+
raid0 -> raid4 (add dedicated parity device)
389+
raid0 -> raid5 (add dedicated parity device)
390+
raid0 -> raid10 with near layout and N >= 2 mirror groups (raid0 stripes have to become first member within mirror groups)
391+
raid1 -> linear
392+
raid1 -> raid5 with 2 mirrors
393+
raid4 -> raid5 w/ rotating parity
394+
raid5 with dedicated parity device -> raid4
395+
raid5 -> raid6 (with dedicated Q-syndrome)
396+
raid6 (with dedicated Q-syndrome) -> raid5
397+
raid10 with near layout and even number of disks -> raid0 (select any in-sync device from each mirror group)
398+
399+
Reshape:
400+
linear: not possible
401+
raid0: not possible
402+
raid1: change number of mirrors
403+
raid4: add and remove stripes (minimum 3), change stripesize
404+
raid5: add and remove stripes (minimum 3, special case 2 for raid1 takeover), change rotating parity algorithms, change stripesize
405+
raid6: add and remove stripes (minimum 4), change rotating syndrome algorithms, change stripesize
406+
raid10 near: add stripes (minimum 4), change stripesize, no stripe removal possible, change to offset layout
407+
raid10 offset: add stripes, change stripesize, no stripe removal possible, change to near layout
408+
raid10 far: not possible
409+
410+
Table line examples:
411+
412+
### raid1 -> raid5
413+
#
414+
# 2 devices limitation in raid1.
415+
# raid5 personality is able to just map 2 like raid1.
416+
# Reshape after takeover to change to full raid5 layout
417+
418+
0 1960886272 raid raid1 3 0 region_size 2048 2 /dev/dm-0 /dev/dm-1 /dev/dm-2 /dev/dm-3
419+
420+
# dm-0 and dm-2 are e.g. 4MiB large metadata devices, dm-1 and dm-3 have to be at least 1960886272 big.
421+
#
422+
# Table line to takeover to raid5
423+
424+
0 1960886272 raid raid5 3 0 region_size 2048 2 /dev/dm-0 /dev/dm-1 /dev/dm-2 /dev/dm-3
425+
426+
# Add required out-of-place reshape space to the beginniong of the given 2 data devices,
427+
# allocate another metadata/data device tuple with the same sizes for the parity space
428+
# and zero the first 4K of the metadata device.
429+
#
430+
# Example table of the out-of-place reshape space addition for one data device, e.g. dm-1
431+
432+
0 8192 linear 8:0 0 1960903888 # <- must be free space segment
433+
8192 1960886272 linear 8:0 0 2048 # previous data segment
434+
435+
# Mapping table for e.g. raid5_rs reshape causing the size of the raid device to double-fold once the reshape finishes.
436+
# Check the status output (e.g. "dmsetup status $RaidDev") for progess.
437+
438+
0 $((2 * 1960886272)) raid raid5 7 0 region_size 2048 data_offset 8192 delta_disk 1 2 /dev/dm-0 /dev/dm-1 /dev/dm-2 /dev/dm-3
439+
440+
375441
Version History
376442
---------------
377443

Documentation/admin-guide/device-mapper/verity.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,10 @@ is available at the cryptsetup project's wiki page
236236

237237
Status
238238
======
239-
V (for Valid) is returned if every check performed so far was valid.
240-
If any check failed, C (for Corruption) is returned.
239+
1. V (for Valid) is returned if every check performed so far was valid.
240+
If any check failed, C (for Corruption) is returned.
241+
2. Number of corrected blocks by Forward Error Correction.
242+
'-' if Forward Error Correction is not enabled.
241243

242244
Example
243245
=======

Documentation/admin-guide/laptops/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ Laptop Drivers
1717
sonypi
1818
thinkpad-acpi
1919
toshiba_haps
20+
uniwill-laptop

0 commit comments

Comments
 (0)