Skip to content

Commit 5b9b2e6

Browse files
committed
Merge tag 'v6.9-rc3' into x86/boot, to pick up fixes before queueing up more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 4faa0e5 + fec50db commit 5b9b2e6

2,420 files changed

Lines changed: 62309 additions & 29705 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.

.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 <oldhamca@gmail.com>
2020
Adam Radford <aradford@gmail.com>
2121
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2222
Adrian Bunk <bunk@stusta.de>
23+
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
2324
Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
2425
Alan Cox <alan@lxorguk.ukuu.org.uk>
2526
Alan Cox <root@hraefn.swansea.linux.org.uk>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3637
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3738
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3839
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
3941
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
4042
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
4143
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -110,6 +112,7 @@ Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
110112
Brian Avery <b.avery@hp.com>
111113
Brian King <brking@us.ibm.com>
112114
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
115+
Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
113116
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
114117
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
115118
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
@@ -340,7 +343,8 @@ Lee Jones <lee@kernel.org> <joneslee@google.com>
340343
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
341344
Lee Jones <lee@kernel.org> <lee.jones@linaro.org>
342345
Lee Jones <lee@kernel.org> <lee@ubuntu.com>
343-
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
346+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>
347+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>
344348
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
345349
Leonard Göhrs <l.goehrs@pengutronix.de>
346350
Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -439,6 +443,8 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
439443
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
440444
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
441445
Mythri P K <mythripk@ti.com>
446+
Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
447+
Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
442448
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
443449
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
444450
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
@@ -495,7 +501,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
495501
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
496502
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
497503
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
498-
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
504+
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
505+
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
499506
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
500507
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
501508
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
@@ -525,6 +532,7 @@ Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
525532
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
526533
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
527534
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
535+
Ronak Doshi <ronak.doshi@broadcom.com> <doshir@vmware.com>
528536
Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
529537
Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
530538
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
@@ -647,6 +655,7 @@ Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
647655
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
648656
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
649657
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
658+
Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>
650659
Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>
651660
Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
652661
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

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) <quic_jinlmao@quicinc.com>, 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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
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+
Contact: linux-iio@vger.kernel.org
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 <code@elbertmai.com>
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 <heikki.krogerus@linux.intel.com>
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" <yuchao0@huawei.com>
208-
Contact: "Sahitya Tummala" <stummala@codeaurora.org>
208+
Contact: "Sahitya Tummala" <quic_stummala@quicinc.com>
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" <yuchao0@huawei.com>
216-
Contact: "Sahitya Tummala" <stummala@codeaurora.org>
216+
Contact: "Sahitya Tummala" <quic_stummala@quicinc.com>
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)