Skip to content

Commit 0e6ebfd

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.9-rc3' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 186d7ef + fec50db commit 0e6ebfd

File tree

2,420 files changed

+62309
-29705
lines changed

Some content is hidden

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

2,420 files changed

+62309
-29705
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
*.xz
5353
*.zst
5454
Module.symvers
55+
dtbs-list
5556
modules.order
5657

5758
#

.mailmap

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Adam Oldham <[email protected]>
2020
Adam Radford <[email protected]>
2121
2222
Adrian Bunk <[email protected]>
23+
2324
2425
2526
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3637
Alexei Starovoitov <[email protected]> <[email protected]>
3738
Alexei Starovoitov <[email protected]> <[email protected]>
3839
Alexei Starovoitov <[email protected]> <[email protected]>
40+
3941
4042
4143
@@ -110,6 +112,7 @@ Brendan Higgins <[email protected]> <[email protected]>
110112
Brian Avery <[email protected]>
111113
Brian King <[email protected]>
112114
115+
113116
114117
115118
@@ -340,7 +343,8 @@ Lee Jones <[email protected]> <[email protected]>
340343
341344
342345
343-
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
346+
347+
344348
345349
Leonard Göhrs <[email protected]>
346350
Leonid I Ananiev <[email protected]>
@@ -439,6 +443,8 @@ Mukesh Ojha <[email protected]> <[email protected]>
439443
440444
441445
Mythri P K <[email protected]>
446+
447+
442448
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
443449
444450
@@ -495,7 +501,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
495501
496502
497503
498-
504+
505+
499506
500507
501508
@@ -525,6 +532,7 @@ Rocky Liao <[email protected]> <[email protected]>
525532
526533
527534
535+
528536
529537
530538
@@ -647,6 +655,7 @@ Viresh Kumar <[email protected]> <[email protected]>
647655
648656
649657
658+
650659
651660
652661

Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ KernelVersion: 3.13
44
Description: The purpose of this directory is to create and remove it.
55

66
A corresponding USB function instance is created/removed.
7-
There are no attributes here.
87

9-
All parameters are set through FunctionFS.
8+
All attributes are read only:
9+
10+
============= ============================================
11+
ready 1 if the function is ready to be used, E.G.
12+
if userspace has written descriptors and
13+
strings to ep0, so the gadget can be
14+
enabled - 0 otherwise.
15+
============= ============================================
16+
17+
All other parameters are set through FunctionFS.

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,90 @@ Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <quic_t
170170
Description:
171171
(RW) Set/Get the MSR(mux select register) for the DSB subunit
172172
TPDM.
173+
174+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_mode
175+
Date: January 2024
176+
KernelVersion 6.9
177+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
178+
Description: (Write) Set the data collection mode of CMB tpdm. Continuous
179+
change creates CMB data set elements on every CMBCLK edge.
180+
Trace-on-change creates CMB data set elements only when a new
181+
data set element differs in value from the previous element
182+
in a CMB data set.
183+
184+
Accepts only one of the 2 values - 0 or 1.
185+
0 : Continuous CMB collection mode.
186+
1 : Trace-on-change CMB collection mode.
187+
188+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpr[0:1]
189+
Date: January 2024
190+
KernelVersion 6.9
191+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
192+
Description:
193+
(RW) Set/Get the value of the trigger pattern for the CMB
194+
subunit TPDM.
195+
196+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpmr[0:1]
197+
Date: January 2024
198+
KernelVersion 6.9
199+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
200+
Description:
201+
(RW) Set/Get the mask of the trigger pattern for the CMB
202+
subunit TPDM.
203+
204+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpr[0:1]
205+
Date: January 2024
206+
KernelVersion 6.9
207+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
208+
Description:
209+
(RW) Set/Get the value of the pattern for the CMB subunit TPDM.
210+
211+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpmr[0:1]
212+
Date: January 2024
213+
KernelVersion 6.9
214+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
215+
Description:
216+
(RW) Set/Get the mask of the pattern for the CMB subunit TPDM.
217+
218+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_patt/enable_ts
219+
Date: January 2024
220+
KernelVersion 6.9
221+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
222+
Description:
223+
(Write) Set the pattern timestamp of CMB tpdm. Read
224+
the pattern timestamp of CMB tpdm.
225+
226+
Accepts only one of the 2 values - 0 or 1.
227+
0 : Disable CMB pattern timestamp.
228+
1 : Enable CMB pattern timestamp.
229+
230+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_ts
231+
Date: January 2024
232+
KernelVersion 6.9
233+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
234+
Description:
235+
(RW) Set/Get the trigger timestamp of the CMB for tpdm.
236+
237+
Accepts only one of the 2 values - 0 or 1.
238+
0 : Set the CMB trigger type to false
239+
1 : Set the CMB trigger type to true
240+
241+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_ts_all
242+
Date: January 2024
243+
KernelVersion 6.9
244+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
245+
Description:
246+
(RW) Read or write the status of timestamp upon all interface.
247+
Only value 0 and 1 can be written to this node. Set this node to 1 to requeset
248+
timestamp to all trace packet.
249+
Accepts only one of the 2 values - 0 or 1.
250+
0 : Disable the timestamp of all trace packets.
251+
1 : Enable the timestamp of all trace packets.
252+
253+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_msr/msr[0:31]
254+
Date: January 2024
255+
KernelVersion 6.9
256+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
257+
Description:
258+
(RW) Set/Get the MSR(mux select register) for the CMB subunit
259+
TPDM.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_shunt_resistorY
2+
KernelVersion: 6.7
3+
4+
Description:
5+
The value of the shunt resistor may be known only at runtime
6+
and set by a client application. This attribute allows to
7+
set its value in micro-ohms. X is the IIO index of the device.
8+
Y is the channel number. The value is used to calculate
9+
current, power and accumulated energy.

Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,16 @@ What: /sys/bus/usb/devices/usbX/descriptors
442442
Description:
443443
Contains the interface descriptors, in binary.
444444

445+
What: /sys/bus/usb/devices/usbX/bos_descriptors
446+
Date: March 2024
447+
Contact: Elbert Mai <[email protected]>
448+
Description:
449+
Binary file containing the cached binary device object store (BOS)
450+
of the device. This consists of the BOS descriptor followed by the
451+
set of device capability descriptors. All descriptors read from
452+
this file are in bus-endian format. Note that the kernel will not
453+
request the BOS from a device if its bcdUSB is less than 0x0201.
454+
445455
What: /sys/bus/usb/devices/usbX/idProduct
446456
Description:
447457
Product ID, in hexadecimal.

Documentation/ABI/testing/sysfs-class-usb_role

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ Description:
1919
- none
2020
- host
2121
- device
22+
23+
What: /sys/class/usb_role/<switch>/connector
24+
Date: Feb 2024
25+
Contact: Heikki Krogerus <[email protected]>
26+
Description:
27+
Optional symlink to the USB Type-C connector.

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,15 @@ Description: Controls the idle timing of system, if there is no FS operation
205205
What: /sys/fs/f2fs/<disk>/discard_idle_interval
206206
Date: September 2018
207207
Contact: "Chao Yu" <[email protected]>
208-
Contact: "Sahitya Tummala" <[email protected]>
208+
Contact: "Sahitya Tummala" <[email protected]>
209209
Description: Controls the idle timing of discard thread given
210210
this time interval.
211211
Default is 5 secs.
212212

213213
What: /sys/fs/f2fs/<disk>/gc_idle_interval
214214
Date: September 2018
215215
Contact: "Chao Yu" <[email protected]>
216-
Contact: "Sahitya Tummala" <[email protected]>
216+
Contact: "Sahitya Tummala" <[email protected]>
217217
Description: Controls the idle timing for gc path. Set to 5 seconds by default.
218218

219219
What: /sys/fs/f2fs/<disk>/iostat_enable
@@ -701,29 +701,31 @@ Description: Support configuring fault injection type, should be
701701
enabled with fault_injection option, fault type value
702702
is shown below, it supports single or combined type.
703703

704-
=================== ===========
705-
Type_Name Type_Value
706-
=================== ===========
707-
FAULT_KMALLOC 0x000000001
708-
FAULT_KVMALLOC 0x000000002
709-
FAULT_PAGE_ALLOC 0x000000004
710-
FAULT_PAGE_GET 0x000000008
711-
FAULT_ALLOC_BIO 0x000000010 (obsolete)
712-
FAULT_ALLOC_NID 0x000000020
713-
FAULT_ORPHAN 0x000000040
714-
FAULT_BLOCK 0x000000080
715-
FAULT_DIR_DEPTH 0x000000100
716-
FAULT_EVICT_INODE 0x000000200
717-
FAULT_TRUNCATE 0x000000400
718-
FAULT_READ_IO 0x000000800
719-
FAULT_CHECKPOINT 0x000001000
720-
FAULT_DISCARD 0x000002000
721-
FAULT_WRITE_IO 0x000004000
722-
FAULT_SLAB_ALLOC 0x000008000
723-
FAULT_DQUOT_INIT 0x000010000
724-
FAULT_LOCK_OP 0x000020000
725-
FAULT_BLKADDR 0x000040000
726-
=================== ===========
704+
=========================== ===========
705+
Type_Name Type_Value
706+
=========================== ===========
707+
FAULT_KMALLOC 0x000000001
708+
FAULT_KVMALLOC 0x000000002
709+
FAULT_PAGE_ALLOC 0x000000004
710+
FAULT_PAGE_GET 0x000000008
711+
FAULT_ALLOC_BIO 0x000000010 (obsolete)
712+
FAULT_ALLOC_NID 0x000000020
713+
FAULT_ORPHAN 0x000000040
714+
FAULT_BLOCK 0x000000080
715+
FAULT_DIR_DEPTH 0x000000100
716+
FAULT_EVICT_INODE 0x000000200
717+
FAULT_TRUNCATE 0x000000400
718+
FAULT_READ_IO 0x000000800
719+
FAULT_CHECKPOINT 0x000001000
720+
FAULT_DISCARD 0x000002000
721+
FAULT_WRITE_IO 0x000004000
722+
FAULT_SLAB_ALLOC 0x000008000
723+
FAULT_DQUOT_INIT 0x000010000
724+
FAULT_LOCK_OP 0x000020000
725+
FAULT_BLKADDR_VALIDITY 0x000040000
726+
FAULT_BLKADDR_CONSISTENCE 0x000080000
727+
FAULT_NO_SEGMENT 0x000100000
728+
=========================== ===========
727729

728730
What: /sys/fs/f2fs/<disk>/discard_io_aware_gran
729731
Date: January 2023

Documentation/admin-guide/cifs/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Introduction
2828
high performance safe distributed caching (leases/oplocks), optional packet
2929
signing, large files, Unicode support and other internationalization
3030
improvements. Since both Samba server and this filesystem client support the
31-
CIFS Unix extensions, and the Linux client also suppors SMB3 POSIX extensions,
31+
CIFS Unix extensions, and the Linux client also supports SMB3 POSIX extensions,
3232
the combination can provide a reasonable alternative to other network and
3333
cluster file systems for fileserving in some Linux to Linux environments,
3434
not just in Linux to Windows (or Linux to Mac) environments.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,12 +1572,28 @@
15721572
The above will cause the "foo" tracing instance to trigger
15731573
a snapshot at the end of boot up.
15741574

1575-
ftrace_dump_on_oops[=orig_cpu]
1575+
ftrace_dump_on_oops[=2(orig_cpu) | =<instance>][,<instance> |
1576+
,<instance>=2(orig_cpu)]
15761577
[FTRACE] will dump the trace buffers on oops.
1577-
If no parameter is passed, ftrace will dump
1578-
buffers of all CPUs, but if you pass orig_cpu, it will
1579-
dump only the buffer of the CPU that triggered the
1580-
oops.
1578+
If no parameter is passed, ftrace will dump global
1579+
buffers of all CPUs, if you pass 2 or orig_cpu, it
1580+
will dump only the buffer of the CPU that triggered
1581+
the oops, or the specific instance will be dumped if
1582+
its name is passed. Multiple instance dump is also
1583+
supported, and instances are separated by commas. Each
1584+
instance supports only dump on CPU that triggered the
1585+
oops by passing 2 or orig_cpu to it.
1586+
1587+
ftrace_dump_on_oops=foo=orig_cpu
1588+
1589+
The above will dump only the buffer of "foo" instance
1590+
on CPU that triggered the oops.
1591+
1592+
ftrace_dump_on_oops,foo,bar=orig_cpu
1593+
1594+
The above will dump global buffer on all CPUs, the
1595+
buffer of "foo" instance on all CPUs and the buffer
1596+
of "bar" instance on CPU that triggered the oops.
15811597

15821598
ftrace_filter=[function-list]
15831599
[FTRACE] Limit the functions traced by the function
@@ -6583,7 +6599,7 @@
65836599
To turn off having tracepoints sent to printk,
65846600
echo 0 > /proc/sys/kernel/tracepoint_printk
65856601
Note, echoing 1 into this file without the
6586-
tracepoint_printk kernel cmdline option has no effect.
6602+
tp_printk kernel cmdline option has no effect.
65876603

65886604
The tp_printk_stop_on_boot (see below) can also be used
65896605
to stop the printing of events to console at

0 commit comments

Comments
 (0)