Skip to content

Commit d2be53a

Browse files
authored
Merge pull request #5751 from bardliao/merge/sound-upstream-20260428
Merge/sound upstream 20260428
2 parents 5d9be4e + c7cf25f commit d2be53a

11,827 files changed

Lines changed: 698879 additions & 374544 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.

.clippy.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
msrv = "1.78.0"
3+
msrv = "1.85.0"
44

55
check-private-items = true
66

@@ -9,3 +9,13 @@ disallowed-macros = [
99
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
1010
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool", allow-invalid = true },
1111
]
12+
13+
[[disallowed-methods]]
14+
path = "core::ffi::CStr::as_ptr"
15+
replacement = "kernel::prelude::CStrExt::as_char_ptr"
16+
reason = "kernel's `char` is always unsigned, use `as_char_ptr` instead"
17+
18+
[[disallowed-methods]]
19+
path = "core::ffi::CStr::from_ptr"
20+
replacement = "kernel::prelude::CStrExt::from_char_ptr"
21+
reason = "kernel's `char` is always unsigned, use `from_char_ptr` instead"

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
.*
1414
*.a
1515
*.asn1.[ch]
16+
*.bc
1617
*.bin
1718
*.bz2
1819
*.c.[012]*.*
@@ -184,3 +185,6 @@ sphinx_*/
184185

185186
# Rust analyzer configuration
186187
/rust-project.json
188+
189+
# bc language scripts (not LLVM bitcode)
190+
!kernel/time/timeconst.bc

.mailmap

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ Andreas Herrmann <aherrman@de.ibm.com>
7575
Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>
7676
Andrej Shadura <andrew.shadura@collabora.co.uk>
7777
Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>
78+
Andrew Donnellan <andrew+kernel@donnellan.id.au> <andrew@donnellan.id.au>
79+
Andrew Donnellan <andrew+kernel@donnellan.id.au> <ajd@linux.ibm.com>
80+
Andrew Donnellan <andrew+kernel@donnellan.id.au> <andrew.donnellan@au1.ibm.com>
7881
Andrew Morton <akpm@linux-foundation.org>
7982
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
8083
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
@@ -196,6 +199,7 @@ Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
196199
Christophe Ricard <christophe.ricard@gmail.com>
197200
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
198201
Christoph Hellwig <hch@lst.de>
202+
Christoph Manszewski <c.manszewski@gmail.com> <christoph.manszewski@intel.com>
199203
Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>
200204
Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>
201205
Chuck Lever <chuck.lever@oracle.com> <cel@citi.umich.edu>
@@ -204,6 +208,7 @@ Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
204208
Corey Minyard <minyard@acm.org>
205209
Damian Hobson-Garcia <dhobsong@igel.co.jp>
206210
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
211+
Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>
207212
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
208213
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
209214
Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -305,7 +310,10 @@ Gokul Sriram Palanisamy <quic_gokulsri@quicinc.com> <gokulsri@codeaurora.org>
305310
Govindaraj Saminathan <quic_gsamin@quicinc.com> <gsamin@codeaurora.org>
306311
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
307312
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
308-
Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>
313+
Guru Das Srinagesh <linux@gurudas.dev>
314+
Guru Das Srinagesh <linux@gurudas.dev> <quic_gurus@quicinc.com>
315+
Guru Das Srinagesh <linux@gurudas.dev> <gurus@codeaurora.org>
316+
Guru Das Srinagesh <linux@gurudas.dev> <gurooodas@gmail.com>
309317
Gustavo Padovan <gustavo@las.ic.unicamp.br>
310318
Gustavo Padovan <padovan@profusion.mobi>
311319
Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>
@@ -314,6 +322,7 @@ Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>
314322
Hans Verkuil <hverkuil@kernel.org> <hverkuil@xs4all.nl>
315323
Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
316324
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
325+
Hans Verkuil <hverkuil@kernel.org> <hans.verkuil@cisco.com>
317326
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
318327
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
319328
Harry Yoo <harry@kernel.org> <harry.yoo@oracle.com>
@@ -329,6 +338,7 @@ Herbert Xu <herbert@gondor.apana.org.au>
329338
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
330339
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
331340
Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>
341+
Igor Korotin <igor.korotin@linux.dev> <igor.korotin.linux@gmail.com>
332342
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
333343
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
334344
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
@@ -419,6 +429,7 @@ John Stultz <johnstul@us.ibm.com>
419429
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
420430
<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>
421431
Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>
432+
Jonathan Cameron <jic23@kernel.org> <jonathan.cameron@huawei.com>
422433
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
423434
<josh@joshtriplett.org> <josh@freedesktop.org>
424435
<josh@joshtriplett.org> <josh@kernel.org>
@@ -576,6 +587,7 @@ Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
576587
Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
577588
Mickaël Salaün <mic@digikod.net> <mic@linux.microsoft.com>
578589
Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
590+
Mike Leach <mike.leach@arm.com> <mike.leach@linaro.org>
579591
Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
580592
Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
581593
Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>
@@ -733,11 +745,13 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
733745
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
734746
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
735747
Sascha Hauer <s.hauer@pengutronix.de>
748+
Sasha Finkelstein <k@chaosmail.tech> <fnkl.kernel@gmail.com>
736749
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
737750
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
738751
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
739752
S.Çağlar Onur <caglar@pardus.org.tr>
740753
Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>
754+
Sean Anderson <sean.anderson@linux.dev> <sean.anderson@seco.com>
741755
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
742756
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
743757
Sean Tranchetti <quic_stranche@quicinc.com> <stranche@codeaurora.org>

CREDITS

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there
7171
S: Buenos Aires
7272
S: Argentina
7373

74-
NTFS FILESYSTEM
75-
N: Anton Altaparmakov
76-
E: anton@tuxera.com
77-
D: NTFS filesystem
78-
7974
N: Tim Alpaerts
8075
E: tim_alpaerts@toyota-motor-europe.com
8176
D: 802.2 class II logical link control layer,
@@ -85,8 +80,8 @@ S: B-2610 Wilrijk-Antwerpen
8580
S: Belgium
8681

8782
N: Anton Altaparmakov
88-
E: aia21@cantab.net
89-
W: http://www-stu.christs.cam.ac.uk/~aia21/
83+
E: anton@tuxera.com
84+
W: http://www.tuxera.com/
9085
D: Author of new NTFS driver, various other kernel hacks.
9186
S: Christ's College
9287
S: Cambridge CB2 3BU
@@ -1456,6 +1451,14 @@ N: Andy Gospodarek
14561451
E: andy@greyhouse.net
14571452
D: Maintenance and contributions to the network interface bonding driver.
14581453

1454+
N: Vivek Goyal
1455+
E: vgoyal@redhat.com
1456+
D: KDUMP, KEXEC, and VIRTIO FILE SYSTEM
1457+
1458+
N: Alexander Graf
1459+
E: graf@amazon.com
1460+
D: Kexec Handover (KHO)
1461+
14591462
N: Wolfgang Grandegger
14601463
E: wg@grandegger.com
14611464
D: Controller Area Network (device drivers)
@@ -3592,6 +3595,16 @@ E: wsalamon@tislabs.com
35923595
E: wsalamon@nai.com
35933596
D: portions of the Linux Security Module (LSM) framework and security modules
35943597

3598+
N: Salil Mehta
3599+
E: salil.mehta@opnsrc.net
3600+
D: Co-authored Huawei/HiSilicon Kunpeng 920 SoC HNS3 PF and VF 100G
3601+
D: Ethernet driver
3602+
D: Co-authored Huawei/HiSilicon Kunpeng 916 SoC HNS 10G Ethernet
3603+
D: driver enhancements
3604+
D: Maintained Huawei/HiSilicon HNS and HNS3 10G/100G Ethernet drivers
3605+
D: for Kunpeng 916 family, 920 family of SoCs
3606+
S: Cambridge, Cambridgeshire, United Kingdom
3607+
35953608
N: Robert Sanders
35963609
E: gt8134b@prism.gatech.edu
35973610
D: Dosemu
@@ -3639,6 +3652,11 @@ S: Dag Hammerskjolds v. 3E
36393652
S: S-226 64 LUND
36403653
S: Sweden
36413654

3655+
N: Tilman Schmidt
3656+
E: tilman@imap.cc
3657+
D: Siemens Gigaset ISDN driver author and maintainer
3658+
D: ISDN CAPI subsystem contributions
3659+
36423660
N: Henning P. Schmiedehausen
36433661
E: hps@tanstaafl.de
36443662
D: added PCI support to the serial driver
@@ -4560,8 +4578,5 @@ D: MD driver
45604578
D: EISA/sysfs subsystem
45614579
S: France
45624580

4563-
# Don't add your name here, unless you really _are_ after Marc
4564-
# alphabetically. Leonard used to be very proud of being the
4565-
# last entry, and he'll get positively pissed if he can't even
4566-
# be second-to-last. (and this file really _is_ supposed to be
4567-
# in alphabetic order)
4581+
# Don't add your name here unless you really are last alphabetically.
4582+
# (This file is supposed to be kept in alphabetical order by last name.)

Documentation/.renames.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -783,11 +783,9 @@ namespaces/compatibility-list admin-guide/namespaces/compatibility-list
783783
namespaces/index admin-guide/namespaces/index
784784
namespaces/resource-control admin-guide/namespaces/resource-control
785785
networking/altera_tse networking/device_drivers/ethernet/altera/altera_tse
786-
networking/baycom networking/device_drivers/hamradio/baycom
787786
networking/bpf_flow_dissector bpf/prog_flow_dissector
788787
networking/cxacru networking/device_drivers/atm/cxacru
789788
networking/defza networking/device_drivers/fddi/defza
790-
networking/device_drivers/3com/3c509 networking/device_drivers/ethernet/3com/3c509
791789
networking/device_drivers/3com/vortex networking/device_drivers/ethernet/3com/vortex
792790
networking/device_drivers/amazon/ena networking/device_drivers/ethernet/amazon/ena
793791
networking/device_drivers/aquantia/atlantic networking/device_drivers/ethernet/aquantia/atlantic
@@ -822,7 +820,6 @@ networking/device_drivers/microsoft/netvsc networking/device_drivers/ethernet/mi
822820
networking/device_drivers/netronome/nfp networking/device_drivers/ethernet/netronome/nfp
823821
networking/device_drivers/pensando/ionic networking/device_drivers/ethernet/pensando/ionic
824822
networking/device_drivers/qualcomm/rmnet networking/device_drivers/cellular/qualcomm/rmnet
825-
networking/device_drivers/smsc/smc9 networking/device_drivers/ethernet/smsc/smc9
826823
networking/device_drivers/stmicro/stmmac networking/device_drivers/ethernet/stmicro/stmmac
827824
networking/device_drivers/ti/cpsw networking/device_drivers/ethernet/ti/cpsw
828825
networking/device_drivers/ti/cpsw_switchdev networking/device_drivers/ethernet/ti/cpsw_switchdev
@@ -836,19 +833,16 @@ networking/e100 networking/device_drivers/ethernet/intel/e100
836833
networking/e1000 networking/device_drivers/ethernet/intel/e1000
837834
networking/e1000e networking/device_drivers/ethernet/intel/e1000e
838835
networking/fm10k networking/device_drivers/ethernet/intel/fm10k
839-
networking/fore200e networking/device_drivers/atm/fore200e
840836
networking/hinic networking/device_drivers/ethernet/huawei/hinic
841837
networking/i40e networking/device_drivers/ethernet/intel/i40e
842838
networking/iavf networking/device_drivers/ethernet/intel/iavf
843839
networking/ice networking/device_drivers/ethernet/intel/ice
844840
networking/igb networking/device_drivers/ethernet/intel/igb
845841
networking/igbvf networking/device_drivers/ethernet/intel/igbvf
846-
networking/iphase networking/device_drivers/atm/iphase
847842
networking/ixgbe networking/device_drivers/ethernet/intel/ixgbe
848843
networking/ixgbevf networking/device_drivers/ethernet/intel/ixgbevf
849844
networking/netdev-FAQ process/maintainer-netdev
850845
networking/skfp networking/device_drivers/fddi/skfp
851-
networking/z8530drv networking/device_drivers/hamradio/z8530drv
852846
nfc/index driver-api/nfc/index
853847
nfc/nfc-hci driver-api/nfc/nfc-hci
854848
nfc/nfc-pn544 driver-api/nfc/nfc-pn544

Documentation/ABI/stable/sysfs-block

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,21 @@ Description:
886886
zone commands, they will be treated as regular block devices and
887887
zoned will report "none".
888888

889+
What: /sys/block/<disk>/queue/zoned_qd1_writes
890+
Date: January 2026
891+
Contact: Damien Le Moal <dlemoal@kernel.org>
892+
Description:
893+
[RW] zoned_qd1_writes indicates if write operations to a zoned
894+
block device are being handled using a single issuer context (a
895+
kernel thread) operating at a maximum queue depth of 1. This
896+
attribute is visible only for zoned block devices. The default
897+
value for zoned block devices that are not rotational devices
898+
(e.g. ZNS SSDs or zoned UFS devices) is 0. For rotational zoned
899+
block devices (e.g. SMR HDDs) the default value is 1. Since
900+
this default may not be appropriate for some devices, e.g.
901+
remotely connected devices over high latency networks, the user
902+
can disable this feature by setting this attribute to 0.
903+
889904

890905
What: /sys/block/<disk>/hidden
891906
Date: March 2023

Documentation/ABI/stable/sysfs-driver-speakup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ What: /sys/accessibility/speakup/bleeps
1616
KernelVersion: 2.6
1717
Contact: speakup@linux-speakup.org
1818
Description: This controls whether one hears beeps through the PC speaker
19-
when using speakup's review commands.
20-
TODO: what values does it accept?
19+
when using speakup's review commands. Range: 0-3. 0 = off, 1 = beeps
20+
only, 2 = announcements only, 3 = beeps and announcements (default).
2121

2222
What: /sys/accessibility/speakup/bleep_time
2323
KernelVersion: 2.6

Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ Description: Dump debug registers from the QM.
5050
Available for PF and VF in host. VF in guest currently only
5151
has one debug register.
5252

53+
What: /sys/kernel/debug/hisi_hpre/<bdf>/dev_usage
54+
Date: Mar 2026
55+
Contact: linux-crypto@vger.kernel.org
56+
Description: Query the real-time bandwidth usage of device.
57+
Returns the bandwidth usage of each channel on the device.
58+
The returned number is in percentage.
59+
5360
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/current_q
5461
Date: Sep 2019
5562
Contact: linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ Description: The <bdf> is related the function for PF and VF.
2424
1/1000~1000/1000 of total QoS. The driver reading alg_qos to
2525
get related QoS in the host and VM, Such as "cat alg_qos".
2626

27+
What: /sys/kernel/debug/hisi_sec2/<bdf>/dev_usage
28+
Date: Mar 2026
29+
Contact: linux-crypto@vger.kernel.org
30+
Description: Query the real-time bandwidth usage of device.
31+
Returns the bandwidth usage of each channel on the device.
32+
The returned number is in percentage.
33+
2734
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_regs
2835
Date: Oct 2019
2936
Contact: linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ Description: The <bdf> is related the function for PF and VF.
3636
1/1000~1000/1000 of total QoS. The driver reading alg_qos to
3737
get related QoS in the host and VM, Such as "cat alg_qos".
3838

39+
What: /sys/kernel/debug/hisi_zip/<bdf>/dev_usage
40+
Date: Mar 2026
41+
Contact: linux-crypto@vger.kernel.org
42+
Description: Query the real-time bandwidth usage of device.
43+
Returns the bandwidth usage of each channel on the device.
44+
The returned number is in percentage.
45+
3946
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/regs
4047
Date: Nov 2018
4148
Contact: linux-crypto@vger.kernel.org

0 commit comments

Comments
 (0)