Skip to content

Commit 780e9d3

Browse files
Automatic merge of 'master' into merge (2025-07-29 08:26)
2 parents 946cb6e + 283564a commit 780e9d3

2,354 files changed

Lines changed: 39470 additions & 28975 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.

.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
223223
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
224224
Domen Puncer <domen@coderock.org>
225225
Douglas Gilbert <dougg@torque.net>
226+
Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
227+
<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
226228
Ed L. Cashin <ecashin@coraid.com>
227229
Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
228230
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -414,6 +416,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
414416
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
415417
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
416418
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
419+
Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>
417420
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
418421
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
419422
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -691,6 +694,10 @@ Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
691694
Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
692695
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
693696
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
697+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky.work@gmail.com>
698+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@gmail.com>
699+
Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>
700+
Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>
694701
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
695702
Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>
696703
Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>
@@ -830,3 +837,6 @@ Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
830837
Yusuke Goda <goda.yusuke@renesas.com>
831838
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
832839
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>
840+
Zijun Hu <zijun.hu@oss.qualcomm.com> <quic_zijuhu@quicinc.com>
841+
Zijun Hu <zijun.hu@oss.qualcomm.com> <zijuhu@codeaurora.org>
842+
Zijun Hu <zijun_hu@htc.com>

CREDITS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,10 @@ N: Thomas Gleixner
13971397
E: tglx@linutronix.de
13981398
D: NAND flash hardware support, JFFS2 on NAND flash
13991399

1400+
N: Jérôme Glisse
1401+
E: jglisse@redhat.com
1402+
D: HMM - Heterogeneous Memory Management
1403+
14001404
N: Richard E. Gooch
14011405
E: rgooch@atnf.csiro.au
14021406
D: parent process death signal to children
@@ -2981,6 +2985,11 @@ S: 521 Pleasant Valley Road
29812985
S: Potsdam, New York 13676
29822986
S: USA
29832987

2988+
N: Shannon Nelson
2989+
E: sln@onemain.com
2990+
D: Worked on several network drivers including
2991+
D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl
2992+
29842993
N: Dave Neuer
29852994
E: dave.neuer@pobox.com
29862995
D: Helped implement support for Compaq's H31xx series iPAQs

Documentation/ABI/stable/sysfs-block

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,39 @@ Description:
778778
0, write zeroes is not supported by the device.
779779

780780

781+
What: /sys/block/<disk>/queue/write_zeroes_unmap_max_hw_bytes
782+
Date: January 2025
783+
Contact: Zhang Yi <yi.zhang@huawei.com>
784+
Description:
785+
[RO] This file indicates whether a device supports zeroing data
786+
in a specified block range without incurring the cost of
787+
physically writing zeroes to the media for each individual
788+
block. If this parameter is set to write_zeroes_max_bytes, the
789+
device implements a zeroing operation which opportunistically
790+
avoids writing zeroes to media while still guaranteeing that
791+
subsequent reads from the specified block range will return
792+
zeroed data. This operation is a best-effort optimization, a
793+
device may fall back to physically writing zeroes to the media
794+
due to other factors such as misalignment or being asked to
795+
clear a block range smaller than the device's internal
796+
allocation unit. If this parameter is set to 0, the device may
797+
have to write each logical block media during a zeroing
798+
operation.
799+
800+
801+
What: /sys/block/<disk>/queue/write_zeroes_unmap_max_bytes
802+
Date: January 2025
803+
Contact: Zhang Yi <yi.zhang@huawei.com>
804+
Description:
805+
[RW] While write_zeroes_unmap_max_hw_bytes is the hardware limit
806+
for the device, this setting is the software limit. Since the
807+
unmap write zeroes operation is a best-effort optimization, some
808+
devices may still physically writing zeroes to media. So the
809+
speed of this operation is not guaranteed. Writing a value of
810+
'0' to this file disables this operation. Otherwise, this
811+
parameter should be equal to write_zeroes_unmap_max_hw_bytes.
812+
813+
781814
What: /sys/block/<disk>/queue/zone_append_max_bytes
782815
Date: May 2020
783816
Contact: linux-block@vger.kernel.org

Documentation/ABI/testing/debugfs-pktcdvd

Lines changed: 0 additions & 18 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-class-pktcdvd

Lines changed: 0 additions & 97 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-devices-power

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Date: January 2009
5656
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
5757
Description:
5858
The /sys/devices/.../async attribute allows the user space to
59-
enable or diasble the device's suspend and resume callbacks to
59+
enable or disable the device's suspend and resume callbacks to
6060
be executed asynchronously (ie. in separate threads, in parallel
6161
with the main suspend/resume thread) during system-wide power
6262
transitions (eg. suspend to RAM, hibernation).

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ What: /sys/devices/system/cpu/vulnerabilities
584584
/sys/devices/system/cpu/vulnerabilities/spectre_v1
585585
/sys/devices/system/cpu/vulnerabilities/spectre_v2
586586
/sys/devices/system/cpu/vulnerabilities/srbds
587+
/sys/devices/system/cpu/vulnerabilities/tsa
587588
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
588589
Date: January 2018
589590
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of
711711

712712
The file is read only.
713713

714-
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
714+
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
715715
Date: February 2018
716716
Contact: Stanislav Nijnikov <stanislav.nijnikov@wdc.com>
717717
Description: This file shows the total physical memory resources. This is

Documentation/ABI/testing/sysfs-edac-scrub

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ Description:
4949
(RO) Supported minimum scrub cycle duration in seconds
5050
by the memory scrubber.
5151

52+
Device-based scrub: returns the minimum scrub cycle
53+
supported by the memory device.
54+
55+
Region-based scrub: returns the max of minimum scrub cycles
56+
supported by individual memory devices that back the region.
57+
5258
What: /sys/bus/edac/devices/<dev-name>/scrubX/max_cycle_duration
5359
Date: March 2025
5460
KernelVersion: 6.15
@@ -57,6 +63,16 @@ Description:
5763
(RO) Supported maximum scrub cycle duration in seconds
5864
by the memory scrubber.
5965

66+
Device-based scrub: returns the maximum scrub cycle supported
67+
by the memory device.
68+
69+
Region-based scrub: returns the min of maximum scrub cycles
70+
supported by individual memory devices that back the region.
71+
72+
If the memory device does not provide maximum scrub cycle
73+
information, return the maximum supported value of the scrub
74+
cycle field.
75+
6076
What: /sys/bus/edac/devices/<dev-name>/scrubX/current_cycle_duration
6177
Date: March 2025
6278
KernelVersion: 6.15

Documentation/ABI/testing/sysfs-fs-erofs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description: Shows all enabled kernel features.
55
Supported features:
66
zero_padding, compr_cfgs, big_pcluster, chunked_file,
77
device_table, compr_head2, sb_chksum, ztailpacking,
8-
dedupe, fragments.
8+
dedupe, fragments, 48bit, metabox.
99

1010
What: /sys/fs/erofs/<disk>/sync_decompress
1111
Date: November 2021
@@ -35,3 +35,11 @@ Description: Used to set or show hardware accelerators in effect
3535
and multiple accelerators are separated by '\n'.
3636
Supported accelerator(s): qat_deflate.
3737
Disable all accelerators with an empty string (echo > accel).
38+
39+
What: /sys/fs/erofs/<disk>/dir_ra_bytes
40+
Date: July 2025
41+
Contact: "Chao Yu" <chao@kernel.org>
42+
Description: Used to set or show readahead bytes during readdir(), by
43+
default the value is 16384.
44+
45+
- 0: disable readahead.

0 commit comments

Comments
 (0)