Skip to content

Commit e291c11

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.2 merge window.
2 parents 8c9a599 + c399110 commit e291c11

File tree

12,194 files changed

+634802
-222497
lines changed

Some content is hidden

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

12,194 files changed

+634802
-222497
lines changed

.get_maintainer.ignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
2+
13
Christoph Hellwig <[email protected]>
24
Marc Gonzalez <[email protected]>

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
*.o
3838
*.o.*
3939
*.patch
40+
*.rmeta
41+
*.rsi
4042
*.s
4143
*.so
4244
*.so.dbg
@@ -97,6 +99,7 @@ modules.order
9799
!.gitattributes
98100
!.gitignore
99101
!.mailmap
102+
!.rustfmt.toml
100103

101104
#
102105
# Generated include files
@@ -162,3 +165,6 @@ x509.genkey
162165

163166
# Documentation toolchain
164167
sphinx_*/
168+
169+
# Rust analyzer configuration
170+
/rust-project.json

.mailmap

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ Ben M Cahill <[email protected]>
7171
7272
7373
74+
75+
76+
7477
Björn Steinbrink <[email protected]>
7578
7679
@@ -98,8 +101,7 @@ Christian Brauner <[email protected]> <[email protected]>
98101
Christian Marangi <[email protected]>
99102
Christophe Ricard <[email protected]>
100103
Christoph Hellwig <[email protected]>
101-
102-
104+
103105
Corey Minyard <[email protected]>
104106
Damian Hobson-Garcia <[email protected]>
105107
@@ -135,6 +137,7 @@ Filipe Lautert <[email protected]>
135137
136138
Franck Bui-Huu <[email protected]>
137139
140+
138141
139142
140143
Frank Zago <[email protected]>
@@ -150,6 +153,8 @@ Greg Kroah-Hartman <[email protected]>
150153
Greg Kroah-Hartman <[email protected]>
151154
152155
156+
Guilherme G. Piccoli <[email protected]> <[email protected]>
157+
Guilherme G. Piccoli <[email protected]> <[email protected]>
153158
154159
155160
Gustavo Padovan <[email protected]>
@@ -253,6 +258,7 @@ Linus Lüssing <[email protected]> <[email protected]>
253258
254259
255260
261+
256262
257263
258264
@@ -313,6 +319,7 @@ Morten Welinder <[email protected]>
313319
Mythri P K <[email protected]>
314320
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
315321
322+
316323
Nguyen Anh Quynh <[email protected]>
317324
318325
@@ -330,6 +337,7 @@ Oleksij Rempel <[email protected]> <[email protected]>
330337
331338
332339
340+
333341
334342
Paolo 'Blaisorblade' Giarrusso <[email protected]>
335343
Patrick Mochel <[email protected]>

.rustfmt.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
edition = "2021"
2+
newline_style = "Unix"
3+
4+
# Unstable options that help catching some mistakes in formatting and that we may want to enable
5+
# when they become stable.
6+
#
7+
# They are kept here since they are useful to run from time to time.
8+
#format_code_in_doc_comments = true
9+
#reorder_impl_items = true
10+
#comment_width = 100
11+
#wrap_comments = true
12+
#normalize_comments = true

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,17 @@ Contact: [email protected]
227227
Description: Indicate the number of retires for an enqcmds submission on a sharedwq.
228228
A max value to set attribute is capped at 64.
229229

230+
What: /sys/bus/dsa/devices/wq<m>.<n>/op_config
231+
Date: Sept 14, 2022
232+
KernelVersion: 6.0.0
233+
234+
Description: Shows the operation capability bits displayed in bitmap format
235+
presented by %*pb printk() output format specifier.
236+
The attribute can be configured when the WQ is disabled in
237+
order to configure the WQ to accept specific bits that
238+
correlates to the operations allowed. It's visible only
239+
on platforms that support the capability.
240+
230241
What: /sys/bus/dsa/devices/engine<m>.<n>/group_id
231242
Date: Oct 25, 2019
232243
KernelVersion: 5.6.0
@@ -255,3 +266,27 @@ Contact: [email protected]
255266
Description: Indicates the number of Read Buffers reserved for the use of
256267
engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
257268
Reserved.
269+
270+
What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
271+
Date: Sept 14, 2022
272+
KernelVersion: 6.0.0
273+
274+
Description: Allows control of the number of work descriptors that can be
275+
concurrently processed by an engine in the group as a fraction
276+
of the Maximum Work Descriptors in Progress value specified in
277+
the ENGCAP register. The acceptable values are 0 (default),
278+
1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of
279+
the max value). It's visible only on platforms that support
280+
the capability.
281+
282+
What: /sys/bus/dsa/devices/group<m>.<n>/batch_progress_limit
283+
Date: Sept 14, 2022
284+
KernelVersion: 6.0.0
285+
286+
Description: Allows control of the number of batch descriptors that can be
287+
concurrently processed by an engine in the group as a fraction
288+
of the Maximum Batch Descriptors in Progress value specified in
289+
the ENGCAP register. The acceptable values are 0 (default),
290+
1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of
291+
the max value). It's visible only on platforms that support
292+
the capability.

Documentation/ABI/testing/debugfs-cros-ec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,25 @@ Description:
5454
this feature.
5555

5656
Output will be in the format: "0x%08x\n".
57+
58+
What: /sys/kernel/debug/<cros-ec-device>/suspend_timeout_ms
59+
Date: August 2022
60+
KernelVersion: 6.1
61+
Description:
62+
Some ECs have a feature where they will track transitions of
63+
a hardware-controlled sleep line, such as Intel's SLP_S0 line,
64+
in order to detect cases where a system failed to go into deep
65+
sleep states. The suspend_timeout_ms file controls the amount of
66+
time in milliseconds the EC will wait before declaring a sleep
67+
timeout event and attempting to wake the system.
68+
69+
Supply 0 to use the default value coded into EC firmware. Supply
70+
65535 (EC_HOST_SLEEP_TIMEOUT_INFINITE) to disable the EC sleep
71+
failure detection mechanism. Values in between 0 and 65535
72+
indicate the number of milliseconds the EC should wait after a
73+
sleep transition before declaring a timeout. This includes both
74+
the duration after a sleep command was received but before the
75+
hardware line changed, as well as the duration between when the
76+
hardware line changed and the kernel sent an EC resume command.
77+
78+
Output will be in the format: "%u\n".
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/bus/platform/drivers/amd_pmc/*/smu_fw_version
2+
Date: October 2022
3+
Contact: Mario Limonciello <[email protected]>
4+
Description: Reading this file reports the version of the firmware loaded to
5+
System Management Unit (SMU) contained in AMD CPUs and
6+
APUs.
7+
8+
What: /sys/bus/platform/drivers/amd_pmc/*/smu_program
9+
Date: October 2022
10+
Contact: Mario Limonciello <[email protected]>
11+
Description: Reading this file reports the program corresponding to the SMU
12+
firmware version. The program field is used to disambiguate two
13+
APU/CPU models that can share the same firmware binary.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/devices/platform/*/cnqf_enable
2+
Date: September 2022
3+
Contact: Shyam Sundar S K <[email protected]>
4+
Description: Reading this file tells if the AMD Platform Management(PMF)
5+
Cool n Quiet Framework(CnQF) feature is enabled or not.
6+
7+
This feature is not enabled by default and gets only turned on
8+
if OEM BIOS passes a "flag" to PMF ACPI function (index 11 or 12)
9+
or in case the user writes "on".
10+
11+
To turn off CnQF user can write "off" to the sysfs node.
12+
Note: Systems that support auto mode will not have this sysfs file
13+
available.

Documentation/ABI/testing/sysfs-bus-bcma

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Date: May 2011
33
KernelVersion: 3.0
44
Contact: Rafał Miłecki <[email protected]>
55
Description:
6-
Each BCMA core has it's manufacturer id. See
6+
Each BCMA core has its manufacturer id. See
77
include/linux/bcma/bcma.h for possible values.
88

99
What: /sys/bus/bcma/devices/.../id

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,3 +516,11 @@ Contact: Mathieu Poirier <[email protected]>
516516
Description: (Read) Returns the number of special conditional P1 right-hand keys
517517
that the trace unit can use (0x194). The value is taken
518518
directly from the HW.
519+
520+
What: /sys/bus/coresight/devices/etm<N>/ts_source
521+
Date: October 2022
522+
KernelVersion: 6.1
523+
Contact: Mathieu Poirier <[email protected]> or Suzuki K Poulose <[email protected]>
524+
Description: (Read) When FEAT_TRF is implemented, value of TRFCR_ELx.TS used for
525+
trace session. Otherwise -1 indicates an unknown time source. Check
526+
trcidr0.tssize to see if a global timestamp is available.

0 commit comments

Comments
 (0)