Skip to content

Commit 74656d0

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.0-rc6' into locking/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 0d97db0 + 521a547 commit 74656d0

File tree

13,432 files changed

+1375297
-281972
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,432 files changed

+1375297
-281972
lines changed

‎.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,7 @@ ForEachMacros:
516516
- 'of_property_for_each_string'
517517
- 'of_property_for_each_u32'
518518
- 'pci_bus_for_each_resource'
519+
- 'pci_doe_for_each_off'
519520
- 'pcl_for_each_chunk'
520521
- 'pcl_for_each_segment'
521522
- 'pcm_for_each_format'

‎.get_maintainer.ignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
Alan Cox <alan@lxorguk.ukuu.org.uk>
2+
Alan Cox <root@hraefn.swansea.linux.org.uk>
13
Christoph Hellwig <hch@lst.de>
24
Marc Gonzalez <marc.w.gonzalez@free.fr>

‎.mailmap

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
7878
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
7979
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
8080
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
81+
Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
8182
Brian Avery <b.avery@hp.com>
8283
Brian King <brking@us.ibm.com>
8384
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
@@ -97,8 +98,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
9798
Christian Marangi <ansuelsmth@gmail.com>
9899
Christophe Ricard <christophe.ricard@gmail.com>
99100
Christoph Hellwig <hch@lst.de>
100-
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
101-
Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
101+
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
102102
Corey Minyard <minyard@acm.org>
103103
Damian Hobson-Garcia <dhobsong@igel.co.jp>
104104
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -149,6 +149,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
149149
Greg Kroah-Hartman <greg@kroah.com>
150150
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
151151
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
152+
Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@linux.vnet.ibm.com>
153+
Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@canonical.com>
152154
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
153155
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
154156
Gustavo Padovan <gustavo@las.ic.unicamp.br>
@@ -230,7 +232,7 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
230232
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
231233
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
232234
Kenneth W Chen <kenneth.w.chen@intel.com>
233-
Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>
235+
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
234236
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
235237
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
236238
Koushik <raghavendra.koushik@neterion.com>
@@ -252,6 +254,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
252254
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
253255
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
254256
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
257+
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
255258
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
256259
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
257260
Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>
@@ -312,6 +315,7 @@ Morten Welinder <welinder@troll.com>
312315
Mythri P K <mythripk@ti.com>
313316
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
314317
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
318+
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
315319
Nguyen Anh Quynh <aquynh@gmail.com>
316320
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
317321
Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>

‎CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3495,6 +3495,10 @@ D: wd33c93 SCSI driver (linux-m68k)
34953495
S: San Jose, California
34963496
S: USA
34973497

3498+
N: Joonyoung Shim
3499+
E: y0922.shim@samsung.com
3500+
D: Samsung Exynos DRM drivers
3501+
34983502
N: Robert Siemer
34993503
E: Robert.Siemer@gmx.de
35003504
P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8 3D F2 AC 09 F2 E5 DD EE

‎Documentation/ABI/stable/sysfs-block

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,15 @@ Description:
260260
for discards, and don't read this file.
261261

262262

263+
What: /sys/block/<disk>/queue/dma_alignment
264+
Date: May 2022
265+
Contact: linux-block@vger.kernel.org
266+
Description:
267+
Reports the alignment that user space addresses must have to be
268+
used for raw block device access with O_DIRECT and other driver
269+
specific passthrough mechanisms.
270+
271+
263272
What: /sys/block/<disk>/queue/fua
264273
Date: May 2018
265274
Contact: linux-block@vger.kernel.org

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

Lines changed: 60 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_health
22
Date: June 2018
33
KernelVersion: 4.19
4-
Contact: Vadim Pasternak <vadimpmellanox.com>
4+
Contact: Vadim Pasternak <vadimp@nvidia.com>
55
Description: This file shows ASIC health status. The possible values are:
66
0 - health failed, 2 - health OK, 3 - ASIC in booting state.
77

@@ -11,7 +11,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_version
1111
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_version
1212
Date: June 2018
1313
KernelVersion: 4.19
14-
Contact: Vadim Pasternak <vadimpmellanox.com>
14+
Contact: Vadim Pasternak <vadimp@nvidia.com>
1515
Description: These files show with which CPLD versions have been burned
1616
on carrier and switch boards.
1717

@@ -20,7 +20,7 @@ Description: These files show with which CPLD versions have been burned
2020
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/fan_dir
2121
Date: December 2018
2222
KernelVersion: 5.0
23-
Contact: Vadim Pasternak <vadimpmellanox.com>
23+
Contact: Vadim Pasternak <vadimp@nvidia.com>
2424
Description: This file shows the system fans direction:
2525
forward direction - relevant bit is set 0;
2626
reversed direction - relevant bit is set 1.
@@ -30,7 +30,7 @@ Description: This file shows the system fans direction:
3030
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version
3131
Date: November 2018
3232
KernelVersion: 5.0
33-
Contact: Vadim Pasternak <vadimpmellanox.com>
33+
Contact: Vadim Pasternak <vadimp@nvidia.com>
3434
Description: These files show with which CPLD versions have been burned
3535
on LED or Gearbox board.
3636

@@ -39,7 +39,7 @@ Description: These files show with which CPLD versions have been burned
3939
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
4040
Date: November 2018
4141
KernelVersion: 5.0
42-
Contact: Vadim Pasternak <vadimpmellanox.com>
42+
Contact: Vadim Pasternak <vadimp@nvidia.com>
4343
Description: These files enable and disable the access to the JTAG domain.
4444
By default access to the JTAG domain is disabled.
4545

@@ -48,7 +48,7 @@ Description: These files enable and disable the access to the JTAG domain.
4848
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio
4949
Date: June 2018
5050
KernelVersion: 4.19
51-
Contact: Vadim Pasternak <vadimpmellanox.com>
51+
Contact: Vadim Pasternak <vadimp@nvidia.com>
5252
Description: This file allows iio devices selection.
5353

5454
Attribute select_iio can be written with 0 or with 1. It
@@ -62,7 +62,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu1_on
6262
/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_down
6363
Date: June 2018
6464
KernelVersion: 4.19
65-
Contact: Vadim Pasternak <vadimpmellanox.com>
65+
Contact: Vadim Pasternak <vadimp@nvidia.com>
6666
Description: These files allow asserting system power cycling, switching
6767
power supply units on and off and system's main power domain
6868
shutdown.
@@ -89,7 +89,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_short_pb
8989
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_reset
9090
Date: June 2018
9191
KernelVersion: 4.19
92-
Contact: Vadim Pasternak <vadimpmellanox.com>
92+
Contact: Vadim Pasternak <vadimp@nvidia.com>
9393
Description: These files show the system reset cause, as following: power
9494
auxiliary outage or power refresh, ASIC thermal shutdown, halt,
9595
hotswap, watchdog, firmware reset, long press power button,
@@ -106,7 +106,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_system
106106
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_voltmon_upgrade_fail
107107
Date: November 2018
108108
KernelVersion: 5.0
109-
Contact: Vadim Pasternak <vadimpmellanox.com>
109+
Contact: Vadim Pasternak <vadimp@nvidia.com>
110110
Description: These files show the system reset cause, as following: ComEx
111111
power fail, reset from ComEx, system platform reset, reset
112112
due to voltage monitor devices upgrade failure,
@@ -119,7 +119,7 @@ Description: These files show the system reset cause, as following: ComEx
119119
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version
120120
Date: November 2018
121121
KernelVersion: 5.0
122-
Contact: Vadim Pasternak <vadimpmellanox.com>
122+
Contact: Vadim Pasternak <vadimp@nvidia.com>
123123
Description: These files show with which CPLD versions have been burned
124124
on LED board.
125125

@@ -133,7 +133,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sff_wd
133133
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_wd
134134
Date: June 2019
135135
KernelVersion: 5.3
136-
Contact: Vadim Pasternak <vadimpmellanox.com>
136+
Contact: Vadim Pasternak <vadimp@nvidia.com>
137137
Description: These files show the system reset cause, as following:
138138
COMEX thermal shutdown; wathchdog power off or reset was derived
139139
by one of the next components: COMEX, switch board or by Small Form
@@ -148,7 +148,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config1
148148
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config2
149149
Date: January 2020
150150
KernelVersion: 5.6
151-
Contact: Vadim Pasternak <vadimpmellanox.com>
151+
Contact: Vadim Pasternak <vadimp@nvidia.com>
152152
Description: These files show system static topology identification
153153
like system's static I2C topology, number and type of FPGA
154154
devices within the system and so on.
@@ -161,7 +161,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_soc
161161
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_pwr_off
162162
Date: January 2020
163163
KernelVersion: 5.6
164-
Contact: Vadim Pasternak <vadimpmellanox.com>
164+
Contact: Vadim Pasternak <vadimp@nvidia.com>
165165
Description: These files show the system reset causes, as following: reset
166166
due to AC power failure, reset invoked from software by
167167
assertion reset signal through CPLD. reset caused by signal
@@ -173,7 +173,7 @@ Description: These files show the system reset causes, as following: reset
173173
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pcie_asic_reset_dis
174174
Date: January 2020
175175
KernelVersion: 5.6
176-
Contact: Vadim Pasternak <vadimpmellanox.com>
176+
Contact: Vadim Pasternak <vadimp@nvidia.com>
177177
Description: This file allows to retain ASIC up during PCIe root complex
178178
reset, when attribute is set 1.
179179

@@ -182,7 +182,7 @@ Description: This file allows to retain ASIC up during PCIe root complex
182182
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/vpd_wp
183183
Date: January 2020
184184
KernelVersion: 5.6
185-
Contact: Vadim Pasternak <vadimpmellanox.com>
185+
Contact: Vadim Pasternak <vadimp@nvidia.com>
186186
Description: This file allows to overwrite system VPD hardware write
187187
protection when attribute is set 1.
188188

@@ -191,7 +191,7 @@ Description: This file allows to overwrite system VPD hardware write
191191
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/voltreg_update_status
192192
Date: January 2020
193193
KernelVersion: 5.6
194-
Contact: Vadim Pasternak <vadimpmellanox.com>
194+
Contact: Vadim Pasternak <vadimp@nvidia.com>
195195
Description: This file exposes the configuration update status of burnable
196196
voltage regulator devices. The status values are as following:
197197
0 - OK; 1 - CRC failure; 2 = I2C failure; 3 - in progress.
@@ -201,7 +201,7 @@ Description: This file exposes the configuration update status of burnable
201201
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ufm_version
202202
Date: January 2020
203203
KernelVersion: 5.6
204-
Contact: Vadim Pasternak <vadimpmellanox.com>
204+
Contact: Vadim Pasternak <vadimp@nvidia.com>
205205
Description: This file exposes the firmware version of burnable voltage
206206
regulator devices.
207207

@@ -217,7 +217,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version_min
217217
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version_min
218218
Date: July 2020
219219
KernelVersion: 5.9
220-
Contact: Vadim Pasternak <vadimpmellanox.com>
220+
Contact: Vadim Pasternak <vadimp@nvidia.com>
221221
Description: These files show with which CPLD part numbers and minor
222222
versions have been burned CPLD devices equipped on a
223223
system.
@@ -471,7 +471,7 @@ Description: These files provide the maximum powered required for line card
471471
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/phy_reset
472472
Date: May 2022
473473
KernelVersion: 5.19
474-
Contact: Vadim Pasternak <vadimpmellanox.com>
474+
Contact: Vadim Pasternak <vadimp@nvidia.com>
475475
Description: This file allows to reset PHY 88E1548 when attribute is set 0
476476
due to some abnormal PHY behavior.
477477
Expected behavior:
@@ -483,7 +483,7 @@ Description: This file allows to reset PHY 88E1548 when attribute is set 0
483483
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/mac_reset
484484
Date: May 2022
485485
KernelVersion: 5.19
486-
Contact: Vadim Pasternak <vadimpmellanox.com>
486+
Contact: Vadim Pasternak <vadimp@nvidia.com>
487487
Description: This file allows to reset ASIC MT52132 when attribute is set 0
488488
due to some abnormal ASIC behavior.
489489
Expected behavior:
@@ -495,11 +495,50 @@ Description: This file allows to reset ASIC MT52132 when attribute is set 0
495495
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/qsfp_pwr_good
496496
Date: May 2022
497497
KernelVersion: 5.19
498-
Contact: Vadim Pasternak <vadimpmellanox.com>
498+
Contact: Vadim Pasternak <vadimp@nvidia.com>
499499
Description: This file shows QSFP ports power status. The value is set to 0
500500
when one of any QSFP ports is plugged. The value is set to 1 when
501501
there are no any QSFP ports are plugged.
502502
The possible values are:
503503
0 - Power good, 1 - Not power good.
504504

505505
The files are read only.
506+
507+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_health
508+
Date: July 2022
509+
KernelVersion: 5.20
510+
Contact: Vadim Pasternak <vadimp@nvidia.com>
511+
Description: This file shows 2-nd ASIC health status. The possible values are:
512+
0 - health failed, 2 - health OK, 3 - ASIC in booting state.
513+
514+
The file is read only.
515+
516+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_reset
517+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_reset
518+
Date: July 2022
519+
KernelVersion: 5.20
520+
Contact: Vadim Pasternak <vadimp@nvidia.com>
521+
Description: These files allow to each of ASICs by writing 1.
522+
523+
The files are write only.
524+
525+
526+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready
527+
Date: July 2022
528+
KernelVersion: 5.20
529+
Contact: Vadim Pasternak <vadimp@nvidia.com>
530+
Description: This file is used to indicate remote end (for example BMC) that system
531+
host CPU is ready for sending telemetry data to remote end.
532+
For indication the file should be written 1.
533+
534+
The file is write only.
535+
536+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config3
537+
Date: January 2020
538+
KernelVersion: 5.6
539+
Contact: Vadim Pasternak <vadimp@nvidia.com>
540+
Description: The file indicates COME module hardware configuration.
541+
The value is pushed by hardware through GPIO pins.
542+
The purpose is to expose some minor BOM changes for the same system SKU.
543+
544+
The file is read only.

‎Documentation/ABI/stable/sysfs-module

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ What: /sys/module/<MODULENAME>/srcversion
3838
Date: Jun 2005
3939
Description:
4040
If the module source has MODULE_VERSION, this file will contain
41-
the checksum of the the source code.
41+
the checksum of the source code.
4242

4343
What: /sys/module/<MODULENAME>/version
4444
Date: Jun 2005

‎Documentation/ABI/testing/configfs-usb-gadget-mass-storage

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ KernelVersion: 3.13
1919
Description:
2020
The attributes:
2121

22-
=========== ==============================================
22+
============ ==============================================
2323
file The path to the backing file for the LUN.
2424
Required if LUN is not marked as removable.
2525
ro Flag specifying access to the LUN shall be
@@ -32,4 +32,10 @@ Description:
3232
being a CD-ROM.
3333
nofua Flag specifying that FUA flag
3434
in SCSI WRITE(10,12)
35-
=========== ==============================================
35+
forced_eject This write-only file is useful only when
36+
the function is active. It causes the backing
37+
file to be forcibly detached from the LUN,
38+
regardless of whether the host has allowed it.
39+
Any non-zero number of bytes written will
40+
result in ejection.
41+
============ ==============================================

0 commit comments

Comments
 (0)