Skip to content

Commit 7ae9fb1

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.3 merge window.
2 parents 9c445d2 + 9e69e84 commit 7ae9fb1

14,486 files changed

Lines changed: 751163 additions & 428382 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.

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ ForEachMacros:
222222
- 'for_each_component_dais'
223223
- 'for_each_component_dais_safe'
224224
- 'for_each_console'
225+
- 'for_each_console_srcu'
225226
- 'for_each_cpu'
226227
- 'for_each_cpu_and'
227228
- 'for_each_cpu_not'
@@ -440,8 +441,11 @@ ForEachMacros:
440441
- 'inet_lhash2_for_each_icsk'
441442
- 'inet_lhash2_for_each_icsk_continue'
442443
- 'inet_lhash2_for_each_icsk_rcu'
444+
- 'interval_tree_for_each_double_span'
445+
- 'interval_tree_for_each_span'
443446
- 'intlist__for_each_entry'
444447
- 'intlist__for_each_entry_safe'
448+
- 'iopt_for_each_contig_area'
445449
- 'kcore_copy__for_each_phdr'
446450
- 'key_for_each'
447451
- 'key_for_each_safe'
@@ -535,6 +539,7 @@ ForEachMacros:
535539
- 'perf_hpp_list__for_each_sort_list_safe'
536540
- 'perf_pmu__for_each_hybrid_pmu'
537541
- 'ping_portaddr_for_each_entry'
542+
- 'ping_portaddr_for_each_entry_rcu'
538543
- 'plist_for_each'
539544
- 'plist_for_each_continue'
540545
- 'plist_for_each_entry'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*.dtb
2121
*.dtbo
2222
*.dtb.S
23+
*.dtbo.S
2324
*.dwo
2425
*.elf
2526
*.gcno
@@ -38,6 +39,7 @@
3839
*.o.*
3940
*.patch
4041
*.rmeta
42+
*.rpm
4143
*.rsi
4244
*.s
4345
*.so

.mailmap

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electr
2929
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3030
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3131
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
32+
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
3233
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
3334
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
3435
Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>
@@ -104,6 +105,7 @@ Christoph Hellwig <hch@lst.de>
104105
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
105106
Corey Minyard <minyard@acm.org>
106107
Damian Hobson-Garcia <dhobsong@igel.co.jp>
108+
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
107109
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
108110
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
109111
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -226,6 +228,7 @@ Juha Yrjola <at solidboot.com>
226228
Juha Yrjola <juha.yrjola@nokia.com>
227229
Juha Yrjola <juha.yrjola@solidboot.com>
228230
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
231+
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
229232
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
230233
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
231234
Kay Sievers <kay.sievers@vrfy.org>
@@ -285,6 +288,7 @@ Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
285288
Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
286289
Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
287290
Matthieu CASTET <castet.matthieu@free.fr>
291+
Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
288292
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
289293
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
290294
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
@@ -353,7 +357,8 @@ Peter Oruba <peter@oruba.de>
353357
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
354358
Praveen BP <praveenbp@ti.com>
355359
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
356-
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
360+
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
361+
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
357362
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
358363
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
359364
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
@@ -369,6 +374,8 @@ Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
369374
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
370375
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
371376
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
377+
Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
378+
Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
372379
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
373380
Rudolf Marek <R.Marek@sh.cvut.cz>
374381
Rui Saraiva <rmps@joel.ist.utl.pt>
@@ -380,13 +387,15 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
380387
Santosh Shilimkar <ssantosh@kernel.org>
381388
Sarangdhar Joshi <spjoshi@codeaurora.org>
382389
Sascha Hauer <s.hauer@pengutronix.de>
390+
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
383391
S.Çağlar Onur <caglar@pardus.org.tr>
384392
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
385393
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
386394
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
387395
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
388396
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
389397
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
398+
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
390399
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
391400
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
392401
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
@@ -414,6 +423,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
414423
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
415424
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
416425
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
426+
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
417427
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
418428
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
419429
Uwe Kleine-König <ukleinek@strlen.de>

CREDITS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,11 @@ S: Ottawa, Ontario
918918
S: K1N 6Z9
919919
S: CANADA
920920

921+
N: Vivien Didelot
922+
E: vivien.didelot@gmail.com
923+
D: DSA framework and MV88E6XXX driver
924+
S: Montreal, Quebec, Canada
925+
921926
N: Jeff Dike
922927
E: jdike@karaya.com
923928
W: http://user-mode-linux.sourceforge.net
@@ -1434,6 +1439,10 @@ N: Justin Guyett
14341439
E: jguyett@andrew.cmu.edu
14351440
D: via-rhine net driver hacking
14361441

1442+
N: Nitin Gupta
1443+
E: ngupta@vflare.org
1444+
D: zsmalloc memory allocator and zram block device driver
1445+
14371446
N: Danny ter Haar
14381447
E: dth@cistron.nl
14391448
D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;)
@@ -2447,6 +2456,10 @@ S: 482 Shadowgraph Dr.
24472456
S: San Jose, CA 95110
24482457
S: USA
24492458

2459+
N: Michal Marek
2460+
E: michal.lkml@markovi.net
2461+
D: Kbuild Maintainer 2009-2017
2462+
24502463
N: Martin Mares
24512464
E: mj@ucw.cz
24522465
W: http://www.ucw.cz/~mj/

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Date: Oct 25, 2019
2222
KernelVersion: 5.6.0
2323
Contact: dmaengine@vger.kernel.org
2424
Description: The largest number of work descriptors in a batch.
25+
It's not visible when the device does not support batch.
2526

2627
What: /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
2728
Date: Oct 25, 2019
@@ -49,6 +50,8 @@ Description: The total number of read buffers supported by this device.
4950
The read buffers represent resources within the DSA
5051
implementation, and these resources are allocated by engines to
5152
support operations. See DSA spec v1.2 9.2.4 Total Read Buffers.
53+
It's not visible when the device does not support Read Buffer
54+
allocation control.
5255

5356
What: /sys/bus/dsa/devices/dsa<m>/max_transfer_size
5457
Date: Oct 25, 2019
@@ -122,6 +125,8 @@ Contact: dmaengine@vger.kernel.org
122125
Description: The maximum number of read buffers that may be in use at
123126
one time by operations that access low bandwidth memory in the
124127
device. See DSA spec v1.2 9.2.8 GENCFG on Global Read Buffer Limit.
128+
It's not visible when the device does not support Read Buffer
129+
allocation control.
125130

126131
What: /sys/bus/dsa/devices/dsa<m>/cmd_status
127132
Date: Aug 28, 2020
@@ -205,6 +210,7 @@ KernelVersion: 5.10.0
205210
Contact: dmaengine@vger.kernel.org
206211
Description: The max batch size for this workqueue. Cannot exceed device
207212
max batch size. Configurable parameter.
213+
It's not visible when the device does not support batch.
208214

209215
What: /sys/bus/dsa/devices/wq<m>.<n>/ats_disable
210216
Date: Nov 13, 2020
@@ -250,6 +256,8 @@ KernelVersion: 5.17.0
250256
Contact: dmaengine@vger.kernel.org
251257
Description: Enable the use of global read buffer limit for the group. See DSA
252258
spec v1.2 9.2.18 GRPCFG Use Global Read Buffer Limit.
259+
It's not visible when the device does not support Read Buffer
260+
allocation control.
253261

254262
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_allowed
255263
Date: Dec 10, 2021
@@ -258,6 +266,8 @@ Contact: dmaengine@vger.kernel.org
258266
Description: Indicates max number of read buffers that may be in use at one time
259267
by all engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read
260268
Buffers Allowed.
269+
It's not visible when the device does not support Read Buffer
270+
allocation control.
261271

262272
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_reserved
263273
Date: Dec 10, 2021
@@ -266,6 +276,8 @@ Contact: dmaengine@vger.kernel.org
266276
Description: Indicates the number of Read Buffers reserved for the use of
267277
engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
268278
Reserved.
279+
It's not visible when the device does not support Read Buffer
280+
allocation control.
269281

270282
What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
271283
Date: Sept 14, 2022

Documentation/ABI/stable/sysfs-driver-speakup

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ Description: This controls cursor delay when using arrow keys. When a
3535
characters. Set this to a higher value to adjust for the delay
3636
and better synchronisation between cursor position and speech.
3737

38+
What: /sys/accessibility/speakup/cur_phonetic
39+
KernelVersion: 6.2
40+
Contact: speakup@linux-speakup.org
41+
Description: This allows speakup to speak letters phoneticaly when arrowing through
42+
a word letter by letter. This doesn't affect the spelling when typing
43+
the characters. When cur_phonetic=1, speakup will speak characters
44+
phoneticaly when arrowing over a letter. When cur_phonetic=0, speakup
45+
will speak letters as normally.
46+
3847
What: /sys/accessibility/speakup/delimiters
3948
KernelVersion: 2.6
4049
Contact: speakup@linux-speakup.org

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Description: Specific MJPEG format descriptors
197197
read-only
198198
bmaControls this format's data for bmaControls in
199199
the streaming header
200-
bmInterfaceFlags specifies interlace information,
200+
bmInterlaceFlags specifies interlace information,
201201
read-only
202202
bAspectRatioY the X dimension of the picture aspect
203203
ratio, read-only
@@ -253,7 +253,7 @@ Description: Specific uncompressed format descriptors
253253
read-only
254254
bmaControls this format's data for bmaControls in
255255
the streaming header
256-
bmInterfaceFlags specifies interlace information,
256+
bmInterlaceFlags specifies interlace information,
257257
read-only
258258
bAspectRatioY the X dimension of the picture aspect
259259
ratio, read-only
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/fan_sensor_information
2+
Date: September 2022
3+
KernelVersion: 6.1
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
This file contains the contents of the fan sensor information buffer,
7+
which contains fan sensor entries and a terminating character (0xFF).
8+
9+
Each fan sensor entry consists of three bytes with an unknown meaning,
10+
interested people may use this file for reverse-engineering.
11+
12+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
13+
Date: September 2022
14+
KernelVersion: 6.1
15+
Contact: Armin Wolf <W_Armin@gmx.de>
16+
Description:
17+
This file contains the contents of the thermal sensor information buffer,
18+
which contains thermal sensor entries and a terminating character (0xFF).
19+
20+
Each thermal sensor entry consists of five bytes with an unknown meaning,
21+
interested people may use this file for reverse-engineering.

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ Description: Enables the root user to set the device to specific state.
9191
Valid values are "disable", "enable", "suspend", "resume".
9292
User can read this property to see the valid values
9393

94+
What: /sys/kernel/debug/habanalabs/hl<n>/device_release_watchdog_timeout
95+
Date: Oct 2022
96+
KernelVersion: 6.2
97+
Contact: ttayar@habana.ai
98+
Description: The watchdog timeout value in seconds for a device relese upon
99+
certain error cases, after which the device is reset.
100+
94101
What: /sys/kernel/debug/habanalabs/hl<n>/dma_size
95102
Date: Apr 2021
96103
KernelVersion: 5.13

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,17 @@ Description:
137137
The writeback_limit file is read-write and specifies the maximum
138138
amount of writeback ZRAM can do. The limit could be changed
139139
in run time.
140+
141+
What: /sys/block/zram<id>/recomp_algorithm
142+
Date: November 2022
143+
Contact: Sergey Senozhatsky <senozhatsky@chromium.org>
144+
Description:
145+
The recomp_algorithm file is read-write and allows to set
146+
or show secondary compression algorithms.
147+
148+
What: /sys/block/zram<id>/recompress
149+
Date: November 2022
150+
Contact: Sergey Senozhatsky <senozhatsky@chromium.org>
151+
Description:
152+
The recompress file is write-only and triggers re-compression
153+
with secondary compression algorithms.

0 commit comments

Comments
 (0)