Skip to content

Commit cf87766

Browse files
braunerbrauner
committed
Merge branch 'ovl.fixes'
Bring in an overlayfs fix for v6.13-rc1 that fixes a bug introduced by the overlayfs changes merged for v6.13. Signed-off-by: Christian Brauner <brauner@kernel.org>
2 parents c66f759 + 2957fa4 commit cf87766

File tree

8,116 files changed

+338784
-205884
lines changed

Some content is hidden

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

8,116 files changed

+338784
-205884
lines changed

‎.mailmap

Lines changed: 5 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>
@@ -730,6 +734,7 @@ Will Deacon <will@kernel.org> <will.deacon@arm.com>
730734
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
731735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
732736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737+
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
733738
Yusuke Goda <goda.yusuke@renesas.com>
734739
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
735740
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

‎CREDITS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,9 @@ N: Zach Brown
579579
E: zab@zabbo.net
580580
D: maestro pci sound
581581

582+
N: Zefan Li
583+
D: Contribution to control group stuff
584+
582585
N: David Brownell
583586
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
584587
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few

‎Documentation/ABI/testing/sysfs-bus-platform-drivers-amd_x3d_vcache

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.

‎Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Description:
193193

194194
mechanism:
195195
The means of authentication. This attribute is mandatory.
196-
Only supported type currently is "password".
196+
Supported types are "password" or "certificate".
197197

198198
max_password_length:
199199
A file that can be read to obtain the
@@ -303,6 +303,7 @@ Description:
303303
being configured allowing anyone to make changes.
304304
After any of these operations the system must reboot for the changes to
305305
take effect.
306+
Admin and System certificates are supported from 2025 systems onward.
306307

307308
certificate_thumbprint:
308309
Read only attribute used to display the MD5, SHA1 and SHA256 thumbprints

‎Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,48 @@ Description:
7979
indicates a lane.
8080
crc_err_cnt: (RO) CRC err count on this port.
8181
============= ==== =============================================
82+
83+
What: /sys/devices/platform/HISI04Bx:00/used_types
84+
Date: August 2024
85+
KernelVersion: 6.12
86+
Contact: Huisong Li <lihuisong@huawei.com>
87+
Description:
88+
This interface is used to show all HCCS types used on the
89+
platform, like, HCCS-v1, HCCS-v2 and so on.
90+
91+
What: /sys/devices/platform/HISI04Bx:00/available_inc_dec_lane_types
92+
What: /sys/devices/platform/HISI04Bx:00/dec_lane_of_type
93+
What: /sys/devices/platform/HISI04Bx:00/inc_lane_of_type
94+
Date: August 2024
95+
KernelVersion: 6.12
96+
Contact: Huisong Li <lihuisong@huawei.com>
97+
Description:
98+
These interfaces under /sys/devices/platform/HISI04Bx/ are
99+
used to support the low power consumption feature of some
100+
HCCS types by changing the number of lanes used. The interfaces
101+
changing the number of lanes used are 'dec_lane_of_type' and
102+
'inc_lane_of_type' which require root privileges. These
103+
interfaces aren't exposed if no HCCS type on platform support
104+
this feature. Please note that decreasing lane number is only
105+
allowed if all the specified HCCS ports are not busy.
106+
107+
The low power consumption interfaces are as follows:
108+
109+
============================= ==== ================================
110+
available_inc_dec_lane_types: (RO) available HCCS types (string) to
111+
increase and decrease the number
112+
of lane used, e.g. HCCS-v2.
113+
dec_lane_of_type: (WO) input HCCS type supported
114+
decreasing lane to decrease the
115+
used lane number of all specified
116+
HCCS type ports on platform to
117+
the minimum.
118+
You can query the 'cur_lane_num'
119+
to get the minimum lane number
120+
after executing successfully.
121+
inc_lane_of_type: (WO) input HCCS type supported
122+
increasing lane to increase the
123+
used lane number of all specified
124+
HCCS type ports on platform to
125+
the full lane state.
126+
============================= ==== ================================

‎Documentation/ABI/testing/sysfs-driver-hid-corsair-void

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/fw_version_headset
2+
Date: January 2024
3+
KernelVersion: 6.13
4+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
5+
Description: (R) The firmware version of the headset
6+
* Returns -ENODATA if no version was reported
7+
8+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/fw_version_receiver
9+
Date: January 2024
10+
KernelVersion: 6.13
11+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
12+
Description: (R) The firmware version of the receiver
13+
14+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/microphone_up
15+
Date: July 2023
16+
KernelVersion: 6.13
17+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
18+
Description: (R) Get the physical position of the microphone
19+
* 1 -> Microphone up
20+
* 0 -> Microphone down
21+
22+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/send_alert
23+
Date: July 2023
24+
KernelVersion: 6.13
25+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
26+
Description: (W) Play a built-in notification from the headset (0 / 1)
27+
28+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/set_sidetone
29+
Date: December 2023
30+
KernelVersion: 6.13
31+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
32+
Description: (W) Set the sidetone volume (0 - sidetone_max)
33+
34+
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/sidetone_max
35+
Date: July 2024
36+
KernelVersion: 6.13
37+
Contact: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
38+
Description: (R) Report the maximum sidetone volume

‎Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,11 @@ Contact: intel-gfx@lists.freedesktop.org
8383
Description: RO. Fan speed of device in RPM.
8484

8585
Only supported for particular Intel i915 graphics platforms.
86+
87+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/temp1_input
88+
Date: November 2024
89+
KernelVersion: 6.12
90+
Contact: intel-gfx@lists.freedesktop.org
91+
Description: RO. GPU package temperature in millidegree Celsius.
92+
93+
Only supported for particular Intel i915 graphics platforms.

‎Documentation/ABI/testing/sysfs-driver-panthor-profiling

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/bus/platform/drivers/panthor/.../profiling
2+
Date: September 2024
3+
KernelVersion: 6.11.0
4+
Contact: Adrian Larumbe <adrian.larumbe@collabora.com>
5+
Description:
6+
Bitmask to enable drm fdinfo's job profiling measurements.
7+
Valid values are:
8+
0: Don't enable fdinfo job profiling sources.
9+
1: Enable GPU cycle measurements for running jobs.
10+
2: Enable GPU timestamp sampling for running jobs.

‎Documentation/ABI/testing/sysfs-driver-spi-intel

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/devices/.../intel_spi_protected
2+
Date: Feb 2025
3+
KernelVersion: 6.13
4+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
5+
Description: This attribute allows the userspace to check if the
6+
Intel SPI flash controller is write protected from the host.
7+
8+
What: /sys/devices/.../intel_spi_locked
9+
Date: Feb 2025
10+
KernelVersion: 6.13
11+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
12+
Description: This attribute allows the user space to check if the
13+
Intel SPI flash controller locks supported opcodes.
14+
15+
What: /sys/devices/.../intel_spi_bios_locked
16+
Date: Feb 2025
17+
KernelVersion: 6.13
18+
Contact: Alexander Usyskin <alexander.usyskin@intel.com>
19+
Description: This attribute allows the user space to check if the
20+
Intel SPI flash controller BIOS region is locked for writes.

‎Documentation/ABI/testing/sysfs-fs-erofs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,14 @@ Description: Control strategy of sync decompression:
1616
readahead on atomic contexts only.
1717
- 1 (force on): enable for readpage and readahead.
1818
- 2 (force off): disable for all situations.
19+
20+
What: /sys/fs/erofs/<disk>/drop_caches
21+
Date: November 2024
22+
Contact: "Guo Chunhai" <guochunhai@vivo.com>
23+
Description: Writing to this will drop compression-related caches,
24+
currently used to drop in-memory pclusters and cached
25+
compressed folios:
26+
27+
- 1 : invalidate cached compressed folios
28+
- 2 : drop in-memory pclusters
29+
- 3 : drop in-memory pclusters and cached compressed folios

0 commit comments

Comments
 (0)