Skip to content

Commit a85c72f

Browse files
committed
Automatic merge of 'master' into merge (2024-11-26 21:27)
2 parents bcf2bbe + 42d9e8b commit a85c72f

File tree

10,474 files changed

+403170
-239027
lines changed

Some content is hidden

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

10,474 files changed

+403170
-239027
lines changed

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Christoph Hellwig <hch@lst.de>
44
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
55
Marc Gonzalez <marc.w.gonzalez@free.fr>
6+
Ralf Baechle <ralf@linux-mips.org>

.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3737
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3838
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3939
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Klimov <alexey.klimov@linaro.org> <klimov.linux@gmail.com>
4041
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
4142
Alex Elder <elder@kernel.org>
4243
Alex Elder <elder@kernel.org> <aelder@sgi.com>
@@ -251,6 +252,8 @@ Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>
251252
Gustavo Padovan <gustavo@las.ic.unicamp.br>
252253
Gustavo Padovan <padovan@profusion.mobi>
253254
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
255+
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
256+
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
254257
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
255258
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
256259
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -269,6 +272,7 @@ Jack Pham <quic_jackp@quicinc.com> <jackp@codeaurora.org>
269272
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
270273
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
271274
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
275+
Jai Luthra <jai.luthra@linux.dev> <j-luthra@ti.com>
272276
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
273277
James Bottomley <jejb@mulgrave.(none)>
274278
James Bottomley <jejb@titanic.il.steeleye.com>
@@ -665,6 +669,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
665669
Thomas Graf <tgraf@suug.ch>
666670
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
667671
Thomas Pedersen <twp@codeaurora.org>
672+
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
668673
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
669674
Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>
670675
Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>
@@ -729,6 +734,7 @@ Will Deacon <will@kernel.org> <will.deacon@arm.com>
729734
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
730735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
731736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737+
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
732738
Yusuke Goda <goda.yusuke@renesas.com>
733739
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
734740
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
185185
D: Linux/MIPS port
186186
D: Linux/68k hacker
187187
D: AX25 maintainer
188+
D: EDAC-CAVIUM OCTEON maintainer
189+
D: IOC3 ETHERNET DRIVER maintainer
190+
D: NETROM NETWORK LAYER maintainer
191+
D: ROSE NETWORK LAYER maintainer
192+
D: TURBOCHANNEL SUBSYSTEM maintainer
188193
S: Hauptstrasse 19
189194
S: 79837 St. Blasien
190195
S: Germany
@@ -574,6 +579,9 @@ N: Zach Brown
574579
E: zab@zabbo.net
575580
D: maestro pci sound
576581

582+
N: Zefan Li
583+
D: Contribution to control group stuff
584+
577585
N: David Brownell
578586
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
579587
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
@@ -1204,6 +1212,10 @@ S: Dreisbachstrasse 24
12041212
S: D-57250 Netphen
12051213
S: Germany
12061214

1215+
N: Florian Fainelli
1216+
E: f.fainelli@gmail.com
1217+
D: DSA
1218+
12071219
N: Rik Faith
12081220
E: faith@acm.org
12091221
D: Future Domain TMC-16x0 SCSI driver (author)
@@ -3791,6 +3803,10 @@ S: Department of Zoology, University of Washington
37913803
S: Seattle, WA 98195-1800
37923804
S: USA
37933805

3806+
N: York Sun
3807+
E: york.sun@nxp.com
3808+
D: Freescale DDR EDAC
3809+
37943810
N: Eugene Surovegin
37953811
E: ebs@ebshome.net
37963812
W: https://kernel.ebshome.net/
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/fs/selinux/user
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
Contact: selinux@vger.kernel.org
5+
Description:
6+
7+
The selinuxfs "user" node allows userspace to request a list
8+
of security contexts that can be reached for a given SELinux
9+
user from a given starting context. This was used by libselinux
10+
when various login-style programs requested contexts for
11+
users, but libselinux stopped using it in 2020.
12+
Kernel support will be removed no sooner than Dec 2025.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@ Description:
424424
[RW] This file is used to control (on/off) the iostats
425425
accounting of the disk.
426426

427+
What: /sys/block/<disk>/queue/iostats_passthrough
428+
Date: October 2024
429+
Contact: linux-block@vger.kernel.org
430+
Description:
431+
[RW] This file is used to control (on/off) the iostats
432+
accounting of the disk for passthrough commands.
433+
427434

428435
What: /sys/block/<disk>/queue/logical_block_size
429436
Date: May 2009
@@ -594,6 +601,9 @@ Description:
594601
[RW] Maximum number of kilobytes to read-ahead for filesystems
595602
on this block device.
596603

604+
For MADV_HUGEPAGE, the readahead size may exceed this setting
605+
since its granularity is based on the hugepage size.
606+
597607

598608
What: /sys/block/<disk>/queue/rotational
599609
Date: January 2009

Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,10 @@ Date: Apr 2020
184184
Contact: linux-crypto@vger.kernel.org
185185
Description: Dump the total number of time out requests.
186186
Available for both PF and VF, and take no other effect on HPRE.
187+
188+
What: /sys/kernel/debug/hisi_hpre/<bdf>/cap_regs
189+
Date: Oct 2024
190+
Contact: linux-crypto@vger.kernel.org
191+
Description: Dump the values of the qm and hpre capability bit registers and
192+
support the query of device specifications to facilitate fault locating.
193+
Available for both PF and VF, and take no other effect on HPRE.

Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,10 @@ Contact: linux-crypto@vger.kernel.org
157157
Description: Dump the total number of completed but marked error requests
158158
to be received.
159159
Available for both PF and VF, and take no other effect on SEC.
160+
161+
What: /sys/kernel/debug/hisi_sec2/<bdf>/cap_regs
162+
Date: Oct 2024
163+
Contact: linux-crypto@vger.kernel.org
164+
Description: Dump the values of the qm and sec capability bit registers and
165+
support the query of device specifications to facilitate fault locating.
166+
Available for both PF and VF, and take no other effect on SEC.

Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,10 @@ Contact: linux-crypto@vger.kernel.org
158158
Description: Dump the total number of BD type error requests
159159
to be received.
160160
Available for both PF and VF, and take no other effect on ZIP.
161+
162+
What: /sys/kernel/debug/hisi_zip/<bdf>/cap_regs
163+
Date: Oct 2024
164+
Contact: linux-crypto@vger.kernel.org
165+
Description: Dump the values of the qm and zip capability bit registers and
166+
support the query of device specifications to facilitate fault locating.
167+
Available for both PF and VF, and take no other effect on ZIP.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
What: /sys/bus/event_source/devices/vpa_pmu/format
2+
Date: November 2024
3+
Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
4+
Description: Read-only. Attribute group to describe the magic bits
5+
that go into perf_event_attr.config for a particular pmu.
6+
(See ABI/testing/sysfs-bus-event_source-devices-format).
7+
8+
Each attribute under this group defines a bit range of the
9+
perf_event_attr.config. Supported attribute are listed
10+
below::
11+
event = "config:0-31" - event ID
12+
13+
For example::
14+
15+
l1_to_l2_lat = "event=0x1"
16+
17+
What: /sys/bus/event_source/devices/vpa_pmu/events
18+
Date: November 2024
19+
Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
20+
Description: Read-only. Attribute group to describe performance monitoring
21+
events for the Virtual Processor Area events. Each attribute
22+
in this group describes a single performance monitoring event
23+
supported by vpa_pmu. The name of the file is the name of
24+
the event (See ABI/testing/sysfs-bus-event_source-devices-events).
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/bus/platform/drivers/amd_x3d_vcache/AMDI0101:00/amd_x3d_mode
2+
Date: November 2024
3+
KernelVersion: 6.13
4+
Contact: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
5+
Description: (RW) AMD 3D V-Cache optimizer allows users to switch CPU core
6+
rankings dynamically.
7+
8+
This file switches between these two modes:
9+
- "frequency" cores within the faster CCD are prioritized before
10+
those in the slower CCD.
11+
- "cache" cores within the larger L3 CCD are prioritized before
12+
those in the smaller L3 CCD.

0 commit comments

Comments
 (0)