Skip to content

Commit 9a87ffc

Browse files
dtordtor
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.4 merge window.
2 parents 5dc63e5 + 53bea86 commit 9a87ffc

File tree

13,677 files changed

+637206
-497968
lines changed

Some content is hidden

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

13,677 files changed

+637206
-497968
lines changed

‎.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ ForEachMacros:
190190
- 'for_each_active_dev_scope'
191191
- 'for_each_active_drhd_unit'
192192
- 'for_each_active_iommu'
193+
- 'for_each_active_route'
193194
- 'for_each_aggr_pgid'
194195
- 'for_each_available_child_of_node'
195196
- 'for_each_bench'
@@ -225,7 +226,6 @@ ForEachMacros:
225226
- 'for_each_console_srcu'
226227
- 'for_each_cpu'
227228
- 'for_each_cpu_and'
228-
- 'for_each_cpu_not'
229229
- 'for_each_cpu_wrap'
230230
- 'for_each_dapm_widgets'
231231
- 'for_each_dedup_cand'

‎.gitattributes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.c diff=cpp
2-
*.h diff=cpp
3-
*.dtsi diff=dts
4-
*.dts diff=dts
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
*.[ch] diff=cpp
3+
*.dts diff=dts
4+
*.dts[io] diff=dts

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# subdirectories here. Add them in the ".gitignore" file
55
# in that subdirectory instead.
66
#
7-
# NOTE! Please use 'git ls-files -i --exclude-standard'
7+
# NOTE! Please use 'git ls-files -i -c --exclude-per-directory=.gitignore'
88
# command after changing this file, to see if there are
99
# any tracked files which get ignored after the change.
1010
#
@@ -16,6 +16,7 @@
1616
*.bin
1717
*.bz2
1818
*.c.[012]*.*
19+
*.cover
1920
*.dt.yaml
2021
*.dtb
2122
*.dtbo
@@ -33,6 +34,7 @@
3334
*.lz4
3435
*.lzma
3536
*.lzo
37+
*.mbx
3638
*.mod
3739
*.mod.c
3840
*.o

‎.mailmap

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
2525
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
2626
Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
2727
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
28+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
29+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
2830
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
2931
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3032
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
@@ -119,6 +121,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
119121
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
120122
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
121123
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
124+
Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
122125
Dmitry Baryshkov <dbaryshkov@gmail.com>
123126
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
124127
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -130,8 +133,12 @@ Domen Puncer <domen@coderock.org>
130133
Douglas Gilbert <dougg@torque.net>
131134
Ed L. Cashin <ecashin@coraid.com>
132135
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136+
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
133137
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
134138
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
139+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
140+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
141+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
135142
Felipe W Damasio <felipewd@terra.com.br>
136143
Felix Kuhling <fxkuehl@gmx.de>
137144
Felix Moeller <felix@derklecks.de>
@@ -147,6 +154,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
147154
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
148155
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
149156
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
157+
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
150158
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
151159
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
152160
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -214,6 +222,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
214222
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
215223
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
216224
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
225+
John Crispin <john@phrozen.org> <blogic@openwrt.org>
217226
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
218227
John Stultz <johnstul@us.ibm.com>
219228
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
@@ -300,6 +309,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
300309
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
301310
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
302311
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
312+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
313+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
303314
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
304315
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
305316
Mayuresh Janorkar <mayur@ti.com>
@@ -371,6 +382,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
371382
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
372383
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
373384
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
385+
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
374386
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
375387
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
376388
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -404,7 +416,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
404416
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
405417
Simon Kelley <simon@thekelleys.org.uk>
406418
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
407-
Stephen Hemminger <shemminger@osdl.org>
419+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
420+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
421+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
422+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
408423
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
409424
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
410425
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
@@ -422,6 +437,7 @@ Tony Luck <tony.luck@intel.com>
422437
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
423438
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
424439
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
440+
Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
425441
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
426442
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
427443
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
@@ -435,6 +451,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
435451
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
436452
Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
437453
Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
454+
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
438455
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
439456
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
440457
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

‎CREDITS

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
11731173
D: APM driver (early port)
11741174
D: DRM drivers (author of several)
11751175

1176+
N: Veaceslav Falico
1177+
E: vfalico@gmail.com
1178+
D: Co-maintainer and co-author of the network bonding driver.
1179+
11761180
N: János Farkas
11771181
E: chexum@shadow.banki.hu
11781182
D: romfs, various (mostly networking) fixes
@@ -1848,11 +1852,11 @@ E: ajoshi@shell.unixbox.com
18481852
D: fbdev hacking
18491853

18501854
N: Jesper Juhl
1851-
E: jj@chaosbits.net
1855+
E: jesperjuhl76@gmail.com
18521856
D: Various fixes, cleanups and minor features all over the tree.
18531857
D: Wrote initial version of the hdaps driver (since passed on to others).
1854-
S: Lemnosvej 1, 3.tv
1855-
S: 2300 Copenhagen S.
1858+
S: Titangade 5G, 2.tv
1859+
S: 2200 Copenhagen N.
18561860
S: Denmark
18571861

18581862
N: Jozsef Kadlecsik
@@ -2489,6 +2493,13 @@ D: XF86_Mach8
24892493
D: XF86_8514
24902494
D: cfdisk (curses based disk partitioning program)
24912495

2496+
N: Mat Martineau
2497+
E: mat@martineau.name
2498+
D: MPTCP subsystem co-maintainer 2020-2023
2499+
D: Keyctl restricted keyring and Diffie-Hellman UAPI
2500+
D: Bluetooth L2CAP ERTM mode and AMP
2501+
S: USA
2502+
24922503
N: John S. Marvin
24932504
E: jsm@fc.hp.com
24942505
D: PA-RISC port
@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
41724183
S: 16 Baliqiao Nanjie, Beijing 101100
41734184
S: People's Repulic of China
41744185

4186+
N: Vlad Yasevich
4187+
E: vyasevich@gmail.com
4188+
D: SCTP protocol maintainer.
4189+
41754190
N: Aviad Yehezkel
41764191
E: aviadye@nvidia.com
41774192
D: Kernel TLS implementation and offload support.

‎Documentation/ABI/stable/sysfs-block

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ Contact: linux-block@vger.kernel.org
432432
Description:
433433
[RW] This is the maximum number of kilobytes that the block
434434
layer will allow for a filesystem request. Must be smaller than
435-
or equal to the maximum size allowed by the hardware.
435+
or equal to the maximum size allowed by the hardware. Write 0
436+
to use default kernel settings.
436437

437438

438439
What: /sys/block/<disk>/queue/max_segment_size
@@ -704,6 +705,15 @@ Description:
704705
zoned will report "none".
705706

706707

708+
What: /sys/block/<disk>/hidden
709+
Date: March 2023
710+
Contact: linux-block@vger.kernel.org
711+
Description:
712+
[RO] the block device is hidden. it doesn’t produce events, and
713+
can’t be opened from userspace or using blkdev_get*.
714+
Used for the underlying components of multipath devices.
715+
716+
707717
What: /sys/block/<disk>/stat
708718
Date: February 2008
709719
Contact: Jerome Marchand <jmarchan@redhat.com>

‎Documentation/ABI/stable/sysfs-devices-node

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,42 @@ Date: November 2021
182182
Contact: Jarkko Sakkinen <jarkko@kernel.org>
183183
Description:
184184
The total amount of SGX physical memory in bytes.
185+
186+
What: /sys/devices/system/node/nodeX/memory_failure/total
187+
Date: January 2023
188+
Contact: Jiaqi Yan <jiaqiyan@google.com>
189+
Description:
190+
The total number of raw poisoned pages (pages containing
191+
corrupted data due to memory errors) on a NUMA node.
192+
193+
What: /sys/devices/system/node/nodeX/memory_failure/ignored
194+
Date: January 2023
195+
Contact: Jiaqi Yan <jiaqiyan@google.com>
196+
Description:
197+
Of the raw poisoned pages on a NUMA node, how many pages are
198+
ignored by memory error recovery attempt, usually because
199+
support for this type of pages is unavailable, and kernel
200+
gives up the recovery.
201+
202+
What: /sys/devices/system/node/nodeX/memory_failure/failed
203+
Date: January 2023
204+
Contact: Jiaqi Yan <jiaqiyan@google.com>
205+
Description:
206+
Of the raw poisoned pages on a NUMA node, how many pages are
207+
failed by memory error recovery attempt. This usually means
208+
a key recovery operation failed.
209+
210+
What: /sys/devices/system/node/nodeX/memory_failure/delayed
211+
Date: January 2023
212+
Contact: Jiaqi Yan <jiaqiyan@google.com>
213+
Description:
214+
Of the raw poisoned pages on a NUMA node, how many pages are
215+
delayed by memory error recovery attempt. Delayed poisoned
216+
pages usually will be retried by kernel.
217+
218+
What: /sys/devices/system/node/nodeX/memory_failure/recovered
219+
Date: January 2023
220+
Contact: Jiaqi Yan <jiaqiyan@google.com>
221+
Description:
222+
Of the raw poisoned pages on a NUMA node, how many pages are
223+
recovered by memory error recovery attempt.

‎Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ Description: These files allow to each of ASICs by writing 1.
522522

523523
The files are write only.
524524

525-
526525
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready
527526
Date: July 2022
528527
KernelVersion: 5.20
@@ -542,3 +541,124 @@ Description: The file indicates COME module hardware configuration.
542541
The purpose is to expose some minor BOM changes for the same system SKU.
543542

544543
The file is read only.
544+
545+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_pwr_converter_fail
546+
Date: February 2023
547+
KernelVersion: 6.3
548+
Contact: Vadim Pasternak <vadimp@nvidia.com>
549+
Description: This file shows the system reset cause due to power converter
550+
devices failure.
551+
Value 1 in file means this is reset cause, 0 - otherwise.
552+
553+
The file is read only.
554+
555+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_ap_reset
556+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_ap_reset
557+
Date: February 2023
558+
KernelVersion: 6.3
559+
Contact: Vadim Pasternak <vadimp@nvidia.com>
560+
Description: These files aim to monitor the status of the External Root of Trust (EROT)
561+
processor's RESET output to the Application Processor (AP).
562+
By reading this file, could be determined if the EROT has invalidated or
563+
revoked AP Firmware, at which point it will hold the AP in RESET until a
564+
valid firmware is loaded. This protects the AP from running an
565+
unauthorized firmware. In the normal flow, the AP reset should be released
566+
after the EROT validates the integrity of the FW, and it should be done so
567+
as quickly as possible so that the AP boots before the CPU starts to
568+
communicate to each ASIC.
569+
570+
The files are read only.
571+
572+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_recovery
573+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_recovery
574+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_reset
575+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_reset
576+
Date: February 2023
577+
KernelVersion: 6.3
578+
Contact: Vadim Pasternak <vadimp@nvidia.com>
579+
Description: These files aim to perform External Root of Trust (EROT) recovery
580+
sequence after EROT device failure.
581+
These EROT devices protect ASICs from unauthorized access and in normal
582+
flow their reset should be released with system power – earliest power
583+
up stage, so that EROTs can begin boot and authentication process before
584+
CPU starts to communicate to ASICs.
585+
Issuing a reset to the EROT while asserting the recovery signal will cause
586+
the EROT Application Processor to enter recovery mode so that the EROT FW
587+
can be updated/recovered.
588+
For reset/recovery the related file should be toggled by 1/0.
589+
590+
The files are read/write.
591+
592+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_wp
593+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_wp
594+
Date: February 2023
595+
KernelVersion: 6.3
596+
Contact: Vadim Pasternak <vadimp@nvidia.com>
597+
Description: These files allow access to External Root of Trust (EROT) for reset
598+
and recovery sequence after EROT device failure.
599+
Default is 0 (programming disabled).
600+
If the system is in locked-down mode writing this file will not be allowed.
601+
602+
The files are read/write.
603+
604+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/spi_chnl_select
605+
Date: February 2023
606+
KernelVersion: 6.3
607+
Contact: Vadim Pasternak <vadimp@nvidia.com>
608+
Description: This file allows SPI chip selection for External Root of Trust (EROT)
609+
device Out-of-Band recovery.
610+
File can be written with 0 or with 1. It selects which EROT can be accessed
611+
through SPI device.
612+
613+
The file is read/write.
614+
615+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_pg_fail
616+
Date: February 2023
617+
KernelVersion: 6.3
618+
Contact: Vadim Pasternak vadimp@nvidia.com
619+
Description: This file shows ASIC Power Good status.
620+
Value 1 in file means ASIC Power Good failed, 0 - otherwise.
621+
622+
The file is read only.
623+
624+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd1_boot_fail
625+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd2_boot_fail
626+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_fail
627+
Date: February 2023
628+
KernelVersion: 6.3
629+
Contact: Vadim Pasternak vadimp@nvidia.com
630+
Description: These files are related to clock boards status in system.
631+
- clk_brd1_boot_fail: warning about 1-st clock board failed to boot from CI.
632+
- clk_brd2_boot_fail: warning about 2-nd clock board failed to boot from CI.
633+
- clk_brd_fail: error about common clock board boot failure.
634+
635+
The files are read only.
636+
637+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_prog_en
638+
Date: February 2023
639+
KernelVersion: 6.3
640+
Contact: Vadim Pasternak <vadimp@nvidia.com>
641+
Description: This file enables programming of clock boards.
642+
Default is 0 (programming disabled).
643+
If the system is in locked-down mode writing this file will not be allowed.
644+
645+
The file is read/write.
646+
647+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_converter_prog_en
648+
Date: February 2023
649+
KernelVersion: 6.3
650+
Contact: Vadim Pasternak <vadimp@nvidia.com>
651+
Description: This file enables programming of power converters.
652+
Default is 0 (programming disabled).
653+
If the system is in locked-down mode writing this file will not be allowed.
654+
655+
The file is read/write.
656+
657+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_ac_ok_fail
658+
Date: February 2023
659+
KernelVersion: 6.3
660+
Contact: Vadim Pasternak <vadimp@nvidia.com>
661+
Description: This file shows the system reset cause due to AC power failure.
662+
Value 1 in file means this is reset cause, 0 - otherwise.
663+
664+
The file is read only.

0 commit comments

Comments
 (0)